Kerberos 5 checks incorrect in clients/ud (ITS#1384)

[morpheus@stanford.edu]

Full_Name: Huaqing Zheng
Version: 2.0.15
OS: Solaris 8
URL: 
Submission from: (NULL) (171.64.13.139)


Using MIT's Kerberos 5 distribution, I ran into problems with the string_to_key
functions in clients/ud. The checks for Kerberos 5 used HAVE_KERBERROS_V
instead
of HAVE_KRB5 as defined in portable.h.in. The patch is below:

--- openldap-2.0.15/clients/ud/string_to_key.c.orig     Fri Jul 28 18:53:02
2000
+++ openldap-2.0.15/clients/ud/string_to_key.c  Tue Oct  9 17:05:17 2001
@@ -43,7 +43,7 @@
 #endif
 
 #if defined(WORLDPEACEINOURTIME) /* Use original, not ifs version */
-#ifndef HAVE_KERBEROS_V
+#ifndef HAVE_KRB5
 /*
  * convert an arbitrary length string to a DES key
  */
@@ -130,7 +130,7 @@
 #endif
 }
 
-#endif /* HAVE_KERBEROS_V */
+#endif /* HAVE_KRB5 */
 #else /* Use ifs version */
 
 #if 0
--- openldap-2.0.15/clients/ud/ud.h.orig        Tue Oct  9 17:00:39 2001
+++ openldap-2.0.15/clients/ud/ud.h     Tue Oct  9 17:05:18 2001
@@ -265,7 +265,7 @@
 
 /* in string_to_key.c: */
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) && !defined(openbsd) &&
defin
ed(_AC_KRB_H)
-#if defined(HAVE_AFS_KERBEROS) || !defined(HAVE_KERBEROS_V)
+#if defined(HAVE_AFS_KERBEROS) || !defined(HAVE_KRB5)
 void  des_string_to_key        LDAP_P(( char *str, des_cblock *key ));
 #endif
 #if defined(HAVE_AFS_KERBEROS)