One more patch

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@141 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/debian/patch.no_kerberos_support b/debian/patch.no_kerberos_support
index d6e128a647d3ee585e69fc30d7ad852366a21e91..33153f5ee6f4324d62c88a74f34235d9cd78af6c 100644 (file)
--- a/debian/patch.no_kerberos_support
+++ b/debian/patch.no_kerberos_support
@@ -150,3 +150,40 @@ diff -u -r1.2 -r1.3
 +    return(retval);
  }
 
+Index: server/realm.c
+===================================================================
+RCS file: /afs/1ts.org/project/debian/repository/zephyr/server/realm.c,v
+retrieving revision 1.4
+diff -u -r1.4 realm.c
+--- server/realm.c     12 Jul 2002 00:20:52 -0000      1.4
++++ server/realm.c     12 Jul 2002 01:32:41 -0000
+@@ -481,12 +481,14 @@
+       zdbug((LOG_DEBUG, "rlm_deathgram: suggesting %s to %s", 
+              (server) ? server->addr_str : "nothing", realm->name));
+ 
++#ifdef HAVE_KRB4
+       if (!ticket_lookup(realm->name))
+           if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
+               syslog(LOG_WARNING, "rlm_deathgram failed: %s", 
+                      error_message(retval));
+               return;
+           }
++#endif
+ 
+       if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) 
+           != ZERR_NONE) 
+@@ -575,12 +577,14 @@
+           snotice.z_message = NULL;
+           snotice.z_message_len = 0;
+ 
++#ifdef HAVE_KRB4
+           if (!ticket_lookup(realm->name))
+               if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
+                   syslog(LOG_WARNING, "rlm_wakeup failed: %s", 
+                          error_message(retval));
+                   continue;
+               }
++#endif
+ 
+           if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) 
+               != ZERR_NONE) 

diff --git a/server/realm.c b/server/realm.c
index ce56d9d355b206307599ad38bdfcd3a47224ee38..fd1a2768780957958ccaa23dbce63074876d937e 100644 (file)
--- a/server/realm.c
+++ b/server/realm.c
@@ -481,12 +481,14 @@ realm_deathgram(server)
        zdbug((LOG_DEBUG, "rlm_deathgram: suggesting %s to %s", 
               (server) ? server->addr_str : "nothing", realm->name));
 
+#ifdef HAVE_KRB4
        if (!ticket_lookup(realm->name))
            if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
                syslog(LOG_WARNING, "rlm_deathgram failed: %s", 
                       error_message(retval));
                return;
            }
+#endif
 
        if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) 
            != ZERR_NONE) 
@@ -575,12 +577,14 @@ realm_wakeup()
            snotice.z_message = NULL;
            snotice.z_message_len = 0;
 
+#ifdef HAVE_KRB4
            if (!ticket_lookup(realm->name))
                if ((retval = ticket_retrieve(realm)) != ZERR_NONE) {
                    syslog(LOG_WARNING, "rlm_wakeup failed: %s", 
                           error_message(retval));
                    continue;
                }
+#endif
 
            if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) 
                != ZERR_NONE)