X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fldapd%2Fkerberos.c;h=af331266f3a8f805c715d10ee4d2a81c170e44e1;hb=403f4479bc9f9a864122d4aeecf7284408918302;hp=5304d3d0a9a78e59c2b89614823ce203aa97b7a5;hpb=2fb96905d2c31c36023b6180d7c334c6f6afa7a7;p=openldap

diff --git a/servers/ldapd/kerberos.c b/servers/ldapd/kerberos.c
index 5304d3d0a9..af331266f3 100644
--- a/servers/ldapd/kerberos.c
+++ b/servers/ldapd/kerberos.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
@@ -10,24 +11,22 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
-#ifdef KERBEROS
+#include "portable.h"
+
+#ifdef HAVE_KERBEROS
 
 #include <stdio.h>
-#include <sys/types.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>
+
+#include <ac/krb.h>
+#include <ac/socket.h>
+
 #include <quipu/bind.h>
 #if ISODEPACKAGE == IC
 #include <quipu/DAS-types.h>
 #else
 #include <pepsy/DAS-types.h>
 #endif
+
 #include "lber.h"
 #include "ldap.h"
 #include "common.h"
@@ -40,8 +39,6 @@ kerberosv4_ldap_auth( char *cred, long	len )
 	char		instance[INST_SZ];
 	int		err;
 	AUTH_DAT	ad;
-	extern char	*krb_ldap_service;
-	extern char	*kerberos_keyfile;
 
 	Debug( LDAP_DEBUG_TRACE, "kerberosv4_ldap_auth\n", 0, 0, 0 );
 
@@ -74,8 +71,6 @@ kerberosv4_bindarg(
 	struct timeval			tv;
 	char				realm[REALM_SZ];
 	int				err;
-	extern char			*krb_x500_service;
-	extern char			*krb_x500_instance;
 
 	Debug( LDAP_DEBUG_TRACE, "kerberosv4_bindarg\n", 0, 0, 0 );