From 2b03e82ddfe5797dab4a2811cb2755a2b7cc45b7 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Sat, 25 Oct 1997 17:47:11 +0000
Subject: ZEPHYR_USES_KERBEROS -> HAVE_KRB4; ZEPHYR_USES_HESIOD -> HAVE_HESIOD

---
 clients/zmailnotify/zmailnotify.c           | 8 ++++----
 clients/zshutdown_notify/zshutdown_notify.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'clients')

diff --git a/clients/zmailnotify/zmailnotify.c b/clients/zmailnotify/zmailnotify.c
index f6575e7..5b1ed06 100644
--- a/clients/zmailnotify/zmailnotify.c
+++ b/clients/zmailnotify/zmailnotify.c
@@ -22,11 +22,11 @@ static const char rcsid_zmailnotify_c[] =
 #include <sys/socket.h>
 #include <pwd.h>
 #include <netdb.h>
-#ifdef ZEPHYR_USES_HESIOD
+#ifdef HAVE_HESIOD
 #include <hesiod.h>
 #endif
 
-#ifndef ZEPHYR_USES_KERBEROS
+#ifndef HAVE_KRB4
 #undef KPOP
 #endif
 
@@ -72,7 +72,7 @@ main(argc, argv)
     int i,nbytes,retval,uselock;
     struct passwd *pwd;
     struct _mail mymail;
-#ifdef ZEPHYR_USES_HESIOD
+#ifdef HAVE_HESIOD
     struct hes_postoffice *p;
 #endif
 
@@ -104,7 +104,7 @@ main(argc, argv)
     (void) sprintf(lockfile,"%s/.maillock",dir);
 	
     host = (char *)getenv("MAILHOST");
-#ifdef ZEPHYR_USES_HESIOD
+#ifdef HAVE_HESIOD
     if (host == NULL) {
 	p = hes_getmailhost(user);
 	if (p != NULL && strcmp(p->po_type, "POP") == 0)
diff --git a/clients/zshutdown_notify/zshutdown_notify.c b/clients/zshutdown_notify/zshutdown_notify.c
index e7727e6..4db5a32 100644
--- a/clients/zshutdown_notify/zshutdown_notify.c
+++ b/clients/zshutdown_notify/zshutdown_notify.c
@@ -29,7 +29,7 @@ static const char *rcsid_zshutdown_notify_c =
 #define N_DEF_FORMAT	"From $sender:\n@bold(Shutdown message from $1 at $time)\n@center(System going down, message is:)\n\n$2\n\n@center(@bold($3))"
 #define N_FIELD_CNT	3
 
-#ifdef ZEPHYR_USES_KERBEROS
+#ifdef HAVE_KRB4
 #define SVC_NAME	"rcmd"
 #endif
 
@@ -52,7 +52,7 @@ main(argc,argv)
     char msgbuff[BUFSIZ], message[Z_MAXPKTLEN], *ptr;
     char scratch[BUFSIZ];
     char *msg[N_FIELD_CNT];
-#ifdef ZEPHYR_USES_KERBEROS
+#ifdef HAVE_KRB4
     char tkt_filename[MAXPATHLEN];
     char rlm[REALM_SZ];
     char hn2[MAXHOSTNAMELEN];
@@ -73,7 +73,7 @@ main(argc,argv)
     sprintf(scratch, warning, hostname);
     msg[2] = scratch;
 
-#ifdef ZEPHYR_USES_KERBEROS
+#ifdef HAVE_KRB4
     (void) sprintf(tkt_filename, "/tmp/tkt_zshut_%d", getpid());
     krb_set_tkt_string(tkt_filename);
 
@@ -128,7 +128,7 @@ main(argc,argv)
     notice.z_default_format = N_DEF_FORMAT;
 
     retval = ZSendList(&notice, msg, N_FIELD_CNT, ZAUTH);
-#ifdef ZEPHYR_USES_KERBEROS
+#ifdef HAVE_KRB4
     (void) dest_tkt();
 #endif
 
-- 
cgit v1.2.3