Changed KERBEROS to Z_HaveKerberos

6 files changed, 21 insertions, 22 deletions

diff --git a/lib/ZCkAuth.c b/lib/ZCkAuth.c
index 6670b1f..8ada8e5 100644
--- a/lib/ZCkAuth.c
+++ b/lib/ZCkAuth.c
@@ -32,7 +32,7 @@ int ZCheckAuthentication(notice, from)
     ZNotice_t *notice;
     struct sockaddr_in *from;
 {	
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
     int result;
     char srcprincipal[ANAME_SZ+INST_SZ+REALM_SZ+4];
     KTEXT_ST authent;
diff --git a/lib/ZFmtAuth.c b/lib/ZFmtAuth.c
index cdf7be4..fb893f3 100644
--- a/lib/ZFmtAuth.c
+++ b/lib/ZFmtAuth.c
@@ -17,10 +17,9 @@ static char rcsid_ZFormatAuthenticNotice_c[] = "$Header$";
 #endif
 
 #include <zephyr/mit-copyright.h>
-
 #include <zephyr/zephyr_internal.h>
 
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
 Code_t ZFormatAuthenticNotice(notice, buffer, buffer_len, len, session)
     ZNotice_t *notice;
     register char *buffer;
@@ -44,9 +43,8 @@ Code_t ZFormatAuthenticNotice(notice, buffer, buffer_len, len, session)
 #ifdef NOENCRYPTION
     newnotice.z_checksum = 0;
 #else
-    newnotice.z_checksum = (ZChecksum_t)des_quad_cksum(buffer, NULL,
-						       ptr - buffer, 0,
-						       session);
+    newnotice.z_checksum =
+	(ZChecksum_t)des_quad_cksum(buffer, NULL, ptr - buffer, 0, session);
 #endif
     if ((retval = Z_FormatRawHeader(&newnotice, buffer, buffer_len,
 				    &hdrlen, (char **) 0)) != ZERR_NONE)
diff --git a/lib/ZInit.c b/lib/ZInit.c
index 3b79c21..6082664 100644
--- a/lib/ZInit.c
+++ b/lib/ZInit.c
@@ -18,12 +18,12 @@ static char rcsid_ZInitialize_c[] =
 #endif
 
 #include <zephyr/mit-copyright.h>
-
 #include <zephyr/zephyr_internal.h>
+
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/param.h>
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
 #include "krb_err.h"
 #endif
 
@@ -31,14 +31,13 @@ Code_t ZInitialize()
 {
     struct servent *hmserv;
     char addr[4];
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
     int krbval;
-#endif
-    
-    initialize_zeph_error_table();
-#ifdef KERBEROS
+
     initialize_krb_error_table();
 #endif
+
+    initialize_zeph_error_table();
     
     (void) memset((char *)&__HM_addr, 0, sizeof(__HM_addr));
 
@@ -60,7 +59,7 @@ Code_t ZInitialize()
 
     __HM_set = 0;
 
-#ifdef KERBEROS    
+#ifdef Z_HaveKerberos    
     if ((krbval = krb_get_lrealm(__Zephyr_realm, 1)) != KSUCCESS)
 	return (krbval);
 #endif
diff --git a/lib/ZMkAuth.c b/lib/ZMkAuth.c
index 7b11a34..3c19e26 100644
--- a/lib/ZMkAuth.c
+++ b/lib/ZMkAuth.c
@@ -17,14 +17,14 @@ static char rcsid_ZMakeAuthentication_c[] = "$Id$";
 #endif
 
 #include <zephyr/zephyr_internal.h>
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
 #include "krb_err.h"
 static long last_authent_time = 0L;
 static KTEXT_ST last_authent;
 #endif
 
 Code_t ZResetAuthentication () {
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
     last_authent_time = 0L;
 #endif
     return ZERR_NONE;
@@ -36,7 +36,7 @@ Code_t ZMakeAuthentication(notice, buffer, buffer_len, len)
     int buffer_len;
     int *len;
 {
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
     int retval, result;
     long now,time();
     KTEXT_ST authent;
diff --git a/lib/Zinternal.c b/lib/Zinternal.c
index 411e7b2..331e9a3 100644
--- a/lib/Zinternal.c
+++ b/lib/Zinternal.c
@@ -50,10 +50,6 @@ struct _Z_InputQ *__Q_Head, *__Q_Tail;
 struct sockaddr_in __HM_addr;
 struct sockaddr_in __HM_addr_real;
 int __HM_set;
-#ifdef KERBEROS
-C_Block __Zephyr_session;
-char __Zephyr_realm[REALM_SZ];
-#endif
 int __Zephyr_server;
 ZLocations_t *__locate_list;
 int __locate_num;
@@ -61,6 +57,12 @@ int __locate_next;
 ZSubscription_t *__subscriptions_list;
 int __subscriptions_num;
 int __subscriptions_next;
+
+#ifdef Z_HaveKerberos
+C_Block __Zephyr_session;
+char __Zephyr_realm[REALM_SZ];
+#endif
+
 #ifdef Z_DEBUG
 void (*__Z_debug_print) Zproto((const char *fmt, va_list args, void *closure));
 #endif
diff --git a/lib/acl_files.c b/lib/acl_files.c
index c259957..9c05204 100644
--- a/lib/acl_files.c
+++ b/lib/acl_files.c
@@ -117,7 +117,7 @@ char *canon;
 	canon += len;
 	*canon++ = '\0';
     } 
-#ifdef KERBEROS
+#ifdef Z_HaveKerberos
     else if(krb_get_lrealm(canon, 1) != KSUCCESS) {
 	strcpy(canon, KRB_REALM);
     }