r4536@bucket (orig r283): kcr | 2008-07-18 16:37:47 -0400

 ZFormatAuthenticNotice is a krb4-only thing

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

diff --git a/zephyr/lib/ZFmtAuth.c b/zephyr/lib/ZFmtAuth.c
index 821e6086a24520b0e81329b12ea7218b05fabcfa..92fb3c612af34453cb0badd4a5918ccb019eae49 100644 (file)
--- a/zephyr/lib/ZFmtAuth.c
+++ b/zephyr/lib/ZFmtAuth.c
@@ -16,7 +16,7 @@ static const char rcsid_ZFormatAuthenticNotice_c[] = "$Id$";
 
 #include <internal.h>
 
-#if defined(HAVE_KRB4) || defined(HAVE_KRB5)
+#ifdef HAVE_KRB4
 Code_t
 ZFormatAuthenticNotice(ZNotice_t *notice,
                       char *buffer,
@@ -82,6 +82,7 @@ ZFormatAuthenticNoticeV5(ZNotice_t *notice,
     if (retval)
          return (ZAUTH_FAILED);
 
+#ifdef HAVE_KRB4
     if (key_len == 8 && (enctype == ENCTYPE_DES_CBC_CRC || 
                          enctype == ENCTYPE_DES_CBC_MD4 ||
                          enctype == ENCTYPE_DES_CBC_MD5)) {
@@ -90,6 +91,7 @@ ZFormatAuthenticNoticeV5(ZNotice_t *notice,
          return ZFormatAuthenticNotice(notice, buffer, buffer_len, len,
                                        tmp);
     }
+#endif
          
     newnotice = *notice;
     newnotice.z_auth = 1;