summaryrefslogtreecommitdiff
path: root/server/kstuff.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/kstuff.c')
-rw-r--r--server/kstuff.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/server/kstuff.c b/server/kstuff.c
index 57a04de..20c5a55 100644
--- a/server/kstuff.c
+++ b/server/kstuff.c
@@ -23,8 +23,12 @@ static char rcsid_kstuff_c[] = "$Id$";
#include <ctype.h>
#include <netdb.h>
-#include <strings.h>
+#include <string.h>
+
#include <zephyr/zephyr_internal.h>
+#ifdef KERBEROS
+#include <zephyr/krb_err.h>
+#endif
static char tkt_file[] = ZEPHYR_TKFILE;
@@ -223,7 +227,7 @@ check_cache (notice, from)
return ZAUTH_FAILED;
}
#ifndef NOENCRYPTION
- _BCOPY (a->session_key, __Zephyr_session, sizeof (C_Block));
+ (void) memcpy (__Zephyr_session, a->session_key, sizeof (C_Block));
#endif
return ZAUTH_YES;
}
@@ -307,10 +311,10 @@ ZCheckAuthentication(notice, from)
SERVER_INSTANCE, (int) from->sin_addr.s_addr,
&dat, SERVER_SRVTAB);
if (result == RD_AP_OK) {
- _BCOPY ((void *) dat.session, (void *) a.session_key,
- sizeof(C_Block));
- _BCOPY((char *)dat.session, (char *)__Zephyr_session,
- sizeof(C_Block));
+ (void) memcpy ((void *) a.session_key,(void *) dat.session,
+ sizeof(C_Block));
+ (void) memcpy((char *)__Zephyr_session, (char *)dat.session,
+ sizeof(C_Block));
(void) sprintf(srcprincipal, "%s%s%s@%s", dat.pname,
dat.pinst[0]?".":"", dat.pinst, dat.prealm);
if (strcmp(srcprincipal, notice->z_sender)) {