diff options
Diffstat (limited to 'crypto/heimdal/appl/rsh/rsh_locl.h')
| -rw-r--r-- | crypto/heimdal/appl/rsh/rsh_locl.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/crypto/heimdal/appl/rsh/rsh_locl.h b/crypto/heimdal/appl/rsh/rsh_locl.h index 3418abc..a288d12 100644 --- a/crypto/heimdal/appl/rsh/rsh_locl.h +++ b/crypto/heimdal/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. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: rsh_locl.h,v 1.24 2000/07/02 15:48:46 assar Exp $ */ +/* $Id: rsh_locl.h,v 1.27 2002/08/12 15:09:16 joda Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -97,8 +97,12 @@ #include <krb.h> #include <prot.h> #endif +#ifdef KRB5 #include <krb5.h> +#endif +#ifdef KRB4 #include <kafs.h> +#endif #ifndef _PATH_NOLOGIN #define _PATH_NOLOGIN "/etc/nologin" @@ -113,7 +117,7 @@ #endif #ifndef _PATH_ETC_ENVIRONMENT -#define _PATH_ETC_ENVIRONMENT "/etc/environment" +#define _PATH_ETC_ENVIRONMENT SYSCONFDIR "/environment" #endif /* @@ -124,9 +128,11 @@ enum auth_method { AUTH_KRB4, AUTH_KRB5, AUTH_BROKEN }; extern enum auth_method auth_method; extern int do_encrypt; +#ifdef KRB5 extern krb5_context context; extern krb5_keyblock *keyblock; extern krb5_crypto crypto; +#endif #ifdef KRB4 extern des_key_schedule schedule; extern des_cblock iv; @@ -141,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 |
