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

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
 
 #############################################################################

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
 
 #############################################################################

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>

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();

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>

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>

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 */

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"
 

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>