EXPERIMENTAL: Use sasl bind for simple bind.

Add sasl.c to libldap_r.dsp.

diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index 8546a879bf9c82817baea994da69552906f7a507..a5c7e5c4416d7c0ac4ebf7f77b7368759c575902 100644 (file)
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -52,43 +52,32 @@
  */
 
 int
-ldap_simple_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
+ldap_simple_bind(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *passwd )
 {
-       BerElement      *ber;
+       int rc;
+       int msgid;
+       struct berval cred;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind\n", 0, 0, 0 );
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
 
-       if ( dn == NULL )
-               dn = "";
-       if ( passwd == NULL )
-               passwd = "";
-
-       /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-               return( -1 );
+       if ( passwd != NULL ) {
+               cred.bv_val = (char *) passwd;
+               cred.bv_len = strlen( passwd );
+       } else {
+               cred.bv_val = "";
+               cred.bv_len = 0;
        }
 
-       assert( BER_VALID( ber ) );
-
-       /* fill it in */
-       if ( ber_printf( ber, "{it{ists}}", ++ld->ld_msgid, LDAP_REQ_BIND,
-           ld->ld_version, dn, LDAP_AUTH_SIMPLE, passwd ) == -1 ) {
-               ld->ld_errno = LDAP_ENCODING_ERROR;
-               ber_free( ber, 1 );
-               return( -1 );
-       }
+       rc = ldap_sasl_bind( ld, dn, LDAP_SASL_SIMPLE, &cred,
+               NULL, NULL, &msgid );
 
-#ifndef LDAP_NOCACHE
-       if ( ld->ld_cache != NULL ) {
-               ldap_flush_cache( ld );
-       }
-#endif /* !LDAP_NOCACHE */
-
-       /* send the message */
-       return( ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber ));
+       return rc == LDAP_SUCCESS ? msgid : -1;
 }
 
 /*
@@ -105,16 +94,18 @@ ldap_simple_bind( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
 int
 ldap_simple_bind_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
 {
-       int             msgid;
-       LDAPMessage     *result;
+       struct berval cred;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind_s\n", 0, 0, 0 );
 
-       if ( (msgid = ldap_simple_bind( ld, dn, passwd )) == -1 )
-               return( ld->ld_errno );
-
-       if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 )
-               return( ld->ld_errno ); /* ldap_result sets ld_errno */
+       if ( passwd != NULL ) {
+               cred.bv_val = (char *) passwd;
+               cred.bv_len = strlen( passwd );
+       } else {
+               cred.bv_val = "";
+               cred.bv_len = 0;
+       }
 
-       return( ldap_result2error( ld, result, 1 ) );
+       return ldap_sasl_bind_s( ld, dn, LDAP_SASL_SIMPLE, &cred,
+               NULL, NULL, NULL );
 }

diff --git a/libraries/libldap_r/libldap_r.dsp b/libraries/libldap_r/libldap_r.dsp
index f658d15262f926b5ff6b884154769e4e930d8fd9..be1a2629b2f36aff19bc520d652837159e4930e7 100644 (file)
--- a/libraries/libldap_r/libldap_r.dsp
+++ b/libraries/libldap_r/libldap_r.dsp
@@ -288,6 +288,10 @@ SOURCE=..\libldap\result.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\libldap\sasl.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libldap\sbind.c
 # End Source File
 # Begin Source File