Add Kerberos V5 support from Predrag Balorda <pele@artewisdom.com>

diff --git a/Make-common.dist b/Make-common.dist
index 2c20e1cc525a221ddf1a049a74f29f455dc9eafc..58c5105fb4d34428e1558a933a732bf1472e2d95 100644 (file)
--- a/Make-common.dist
+++ b/Make-common.dist
@@ -81,10 +81,24 @@ EXTRALDFLAGS?=-g
 # uncomment and change the various KRB* lines to point to where the
 # kerberos libraries and include files are installed at your site.
 #
+# *** NOTE ***
+# If you have an MIT Kerberos V distribution and you compiled it with -krb4
+# flag which enables Kerberos IV compatibility, uncomment KERBEROS_V -
+# this will make sure all your includes can be found where they actually are -
+# in this case /usr/local/kerberos/include/kerberosIV - simple change of
+# KRBINCLUDEFLAG will _not_ work. Also uncomment the correct KRBLIBS define.
+# 
+# For Kerberos V with Kerberos IV compatibility uncomment the following line
+#KERBEROS=-DKERBEROS -DKERBEROS_V
+# For Kerberos IV uncomment the following line
 #KERBEROS=-DKERBEROS
+#
 #AFSKERBEROS=-DAFSKERBEROS
 #KRBINCLUDEFLAG        = -I/usr/local/kerberos/include
 #KRBLIBFLAG    = -L/usr/local/kerberos/lib
+# For Kerberos V with Kerberos IV compatibility uncomment the following line
+#KRBLIBS = -lkrb4 -lkrb5 -ldes425
+# For Kerberos IV uncomment the following line
 #KRBLIBS               = -lkrb -ldes
 
 #############################################################################

diff --git a/Make-common.gmake b/Make-common.gmake
index 123006c4ec59678be6fcbf5f70db1bda2b2dde8b..a2195652bada6f5c6e24efc77ccf408404e0899f 100644 (file)
--- a/Make-common.gmake
+++ b/Make-common.gmake
@@ -105,10 +105,24 @@ endif
 # uncomment and change the various KRB* lines to point to where the
 # kerberos libraries and include files are installed at your site.
 #
+# *** NOTE ***
+# If you have an MIT Kerberos V distribution and you compiled it with -krb4
+# flag which enables Kerberos IV compatibility, uncomment KERBEROS_V -
+# this will make sure all your includes can be found where they actually are -
+# in this case /usr/local/kerberos/include/kerberosIV - simple change of
+# KRBINCLUDEFLAG will _not_ work. Also uncomment the correct KRBLIBS define.
+# 
+# For Kerberos V with Kerberos IV compatibility uncomment the following line
+#KERBEROS=-DKERBEROS -DKERBEROS_V
+# For Kerberos IV uncomment the following line
 #KERBEROS=-DKERBEROS
+#
 #AFSKERBEROS=-DAFSKERBEROS
 #KRBINCLUDEFLAG        = -I/usr/local/kerberos/include
 #KRBLIBFLAG    = -L/usr/local/kerberos/lib
+# For Kerberos V with Kerberos IV compatibility uncomment the following line
+#KRBLIBS = -lkrb4 -lkrb5 -ldes425
+# For Kerberos IV uncomment the following line
 #KRBLIBS               = -lkrb -ldes
 
 #############################################################################

diff --git a/clients/ud/auth.c b/clients/ud/auth.c
index 6cb70cdf049b9ecc122c6dfe366384e990009cad..4c191ba2a083494c89ae3b384c165780b58007c6 100644 (file)
--- a/clients/ud/auth.c
+++ b/clients/ud/auth.c
@@ -17,8 +17,12 @@
 #include <ctype.h>
 #ifdef KERBEROS
 #include <sys/types.h>
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
 #include <krb.h>
-#endif
+#endif /* KERBEROS_V */
+#endif /* KERBEROS */
 
 #include <lber.h>
 #include <ldap.h>

diff --git a/clients/ud/string_to_key.c b/clients/ud/string_to_key.c
index d140d36b394c102159b9450a911ec4ba0b67931f..93a1b55336e04a6df6fb49073ce91ceed36a11c8 100644 (file)
--- a/clients/ud/string_to_key.c
+++ b/clients/ud/string_to_key.c
@@ -26,16 +26,27 @@
 
 #ifndef        lint
 static char rcsid_string_to_key_c[] =
-"$Id: string_to_key.c,v 1.1.3.1 1998/08/08 22:43:17 kurt Exp $";
+"$Id: string_to_key.c,v 1.2 1998/08/31 18:49:27 kurt Exp $";
 #endif
 
+#ifdef KERBEROS_V
+#include <kerberosIV/mit-copyright.h>
+#include <kerberosIV/des.h>
+#else
 #include <mit-copyright.h>
-#include <stdio.h>
 #include <des.h>
+#endif /* KERBEROS_V */
+
+#include <stdio.h>
+
 /* #include "des_internal.h" */
 #if 1
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
 #include <krb.h>
-#endif
+#endif /* KERBEROS_V */
+#endif /* 1 */
 
 extern int des_debug;
 extern int des_debug_print();

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index cfccc36dd63076fd024826b89bdccd1b168c3851..22e731e518706120acdf7bf61d375b50fe5b158d 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -21,7 +21,13 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
 #ifdef DOS
 #include "msdos.h"
 #endif /* DOS */
+
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
 #include <krb.h>
+#endif /* KERBEROS_V */
+
 #include <stdlib.h>
 #if !defined(DOS) && !defined( _WIN32 )
 #include <sys/types.h>

diff --git a/servers/ldapd/kerberos.c b/servers/ldapd/kerberos.c
index 937236e29a7f86d12a3b7c3bc9113dc2c3abf8c9..5304d3d0a9a78e59c2b89614823ce203aa97b7a5 100644 (file)
--- a/servers/ldapd/kerberos.c
+++ b/servers/ldapd/kerberos.c
@@ -14,7 +14,11 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include "krb.h"
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
+#include <krb.h>
+#endif /* KERBEROS_V */
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 9aabe85c3652f337518fab5013f15f7ac574da91..4171ac23e70cfbc032a063ac7aff1e3d84bf313d 100644 (file)
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -7,8 +7,12 @@
 #include "slap.h"
 #include "back-ldbm.h"
 #ifdef KERBEROS
-#include "krb.h"
-#endif
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
+#include <krb.h>
+#endif /* KERBEROS_V */
+#endif /* KERBEROS */
 
 #ifdef LDAP_CRYPT
 /* change for crypted passwords -- lukeh */

diff --git a/servers/slapd/back-ldbm/kerberos.c b/servers/slapd/back-ldbm/kerberos.c
index d22553c6590591c37486a1205e9a19042d8ee7fe..84e1313ae9c30d0ac1bb2b213eda45e3d6ab73f4 100644 (file)
--- a/servers/slapd/back-ldbm/kerberos.c
+++ b/servers/slapd/back-ldbm/kerberos.c
@@ -8,7 +8,11 @@
 #include "back-ldbm.h"
 
 #ifdef KERBEROS
-#include "krb.h"
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
+#include <krb.h>
+#endif /* KERBEROS_V */
 
 #define LDAP_KRB_PRINCIPAL     "ldapserver"
 

diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 08253921cd891a768349e7c94b8242acc29f85bf..00f18b835172943e341255688bba452136b17762 100644 (file)
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -20,7 +20,11 @@
 #include <sys/time.h>
 
 #ifdef KERBEROS
+#ifdef KERBEROS_V
+#include <kerberosIV/krb.h>
+#else
 #include <krb.h>
+#endif /* KERBEROS_V */
 #endif /* KERBEROS */
 
 #include <lber.h>