X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=8d3979992c57bca3e662fffebbc0c3de67f42878;hb=8761bbb6e93a36ddb333775cb2ff3c3c9c7d8669;hp=5f6ec17621d4aed779092b93568b2d63e7cda328;hpb=bf6c1e0ad2a9bb7e7ecce016aaa22cd5ffb87a1f;p=openldap

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 5f6ec17621..8d3979992c 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -12,10 +12,13 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+
 #include "slap.h"
 
 extern Backend	*select_backend();
@@ -30,7 +33,8 @@ do_bind(
 )
 {
 	BerElement	*ber = op->o_ber;
-	int		version, method, len, rc;
+	int		version, method, len;
+	unsigned long	rc;
 	char		*dn;
 	struct berval	cred;
 	Backend		*be;
@@ -51,7 +55,7 @@ do_bind(
 	 *	}
 	 */
 
-#ifdef COMPAT30
+#ifdef LDAP_COMPAT30
 	/*
 	 * in version 3.0 there is an extra SEQUENCE tag after the
 	 * BindRequest SEQUENCE tag.
@@ -80,13 +84,13 @@ do_bind(
 		    "decoding error" );
 		return;
 	}
-#ifdef COMPAT30
+#ifdef LDAP_COMPAT30
 	if ( conn->c_version == 30 ) {
 		switch ( method ) {
 		case LDAP_AUTH_SIMPLE_30:
 			method = LDAP_AUTH_SIMPLE;
 			break;
-#ifdef KERBEROS
+#ifdef HAVE_KERBEROS
 		case LDAP_AUTH_KRBV41_30:
 			method = LDAP_AUTH_KRBV41;
 			break;