diff --git a/appl/rsh/common.c b/appl/rsh/common.c index 1480a2928..ab1952cb8 100644 --- a/appl/rsh/common.c +++ b/appl/rsh/common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 1999 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 1999, 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -34,6 +34,8 @@ #include "rsh_locl.h" RCSID("$Id$"); +#if defined(KRB4) || defined(KRB5) + ssize_t do_read (int fd, void *buf, @@ -123,3 +125,4 @@ do_write (int fd, void *buf, size_t sz) } else return write (fd, buf, sz); } +#endif /* KRB4 || KRB5 */ diff --git a/appl/rsh/rsh_locl.h b/appl/rsh/rsh_locl.h index cfc152e84..e4a8b6ba1 100644 --- a/appl/rsh/rsh_locl.h +++ b/appl/rsh/rsh_locl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2000, 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -147,5 +147,10 @@ extern des_cblock iv; #define PATH_RSH BINDIR "/rsh" +#if defined(KRB4) || defined(KRB5) ssize_t do_read (int fd, void *buf, size_t sz); ssize_t do_write (int fd, void *buf, size_t sz); +#else +#define do_write(F, B, L) write((F), (B), (L)) +#define do_read(F, B, L) read((F), (B), (L)) +#endif