X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fsbind.c;h=eb8aaed4bd57f564e125b6011efa549c53f713cd;hb=bb17493d31e19c47bc3a906a39ffa3d57e28aaa4;hp=a5c7e5c4416d7c0ac4ebf7f77b7368759c575902;hpb=f4ff5a929913e268451171462d64310148702bd9;p=openldap

diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index a5c7e5c441..eb8aaed4bd 100644
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -1,5 +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
@@ -15,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
@@ -61,7 +62,11 @@ ldap_simple_bind(
 	int msgid;
 	struct berval cred;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "sbind", LDAP_LEVEL_ENTRY, "ldap_simple_bind\n" ));
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
@@ -96,7 +101,11 @@ ldap_simple_bind_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
 {
 	struct berval cred;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG (( "sbind", LDAP_LEVEL_ENTRY, "ldap_simple_bind_s\n" ));
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind_s\n", 0, 0, 0 );
+#endif
 
 	if ( passwd != NULL ) {
 		cred.bv_val = (char *) passwd;