X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fbind.c;h=ca6e3a10c6bf965d7b65e3c939fbfe671686f858;hb=959edd88c0dc0ad558d9ebc423996c7a9d0f8cbc;hp=b9579f2b4a9c7b6530c0cbb9e74e9e9ea7d21dd7;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index b9579f2b4a..ca6e3a10c6 100644
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -16,7 +16,7 @@
  *		name		DistinguishedName,	 -- who
  *		authentication	CHOICE {
  *			simple		[0] OCTET STRING -- passwd
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
  *			krbv42ldap	[1] OCTET STRING
  *			krbv42dsa	[2] OCTET STRING
 #endif
@@ -66,7 +66,7 @@ ldap_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd, int authmetho
 	case LDAP_AUTH_SIMPLE:
 		return( ldap_simple_bind( ld, dn, passwd ) );
 
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 	case LDAP_AUTH_KRBV41:
 		return( ldap_kerberos_bind1( ld, dn ) );
 
@@ -111,7 +111,7 @@ ldap_bind_s(
 	case LDAP_AUTH_SIMPLE:
 		return( ldap_simple_bind_s( ld, dn, passwd ) );
 
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 	case LDAP_AUTH_KRBV4:
 		return( ldap_kerberos_bind_s( ld, dn ) );
 
@@ -130,14 +130,3 @@ ldap_bind_s(
 		return( ld->ld_errno = LDAP_AUTH_UNKNOWN );
 	}
 }
-
-
-void
-ldap_set_rebind_proc( LDAP *ld, int (*rebindproc)( LDAP *ld, char **dnp,
-	char **passwdp, int *authmethodp, int freeit ))
-{
-	assert( ld != NULL );
-	assert( LDAP_VALID( ld ) );
-
-	ld->ld_rebindproc = rebindproc;
-}