From 1e400cc9d5d3b40539aaa5baca9954d0c48da33b Mon Sep 17 00:00:00 2001
From: Richard Basch <probe@mit.edu>
Date: Fri, 19 Nov 1993 10:52:46 +0000
Subject: Changed <strings.h> to <string.h>, bcopy to memcpy [ANSI] Include
 <zephyr/krb_err.h> if we have Kerberos.

---
 server/kstuff.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'server/kstuff.c')

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)) {
-- 
cgit v1.2.3