use BerVarray for suffix_massaging stuff

[openldap] / servers / slapd / back-ldap / bind.c

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 3031f2e457a9e4f837e6cc7b0fb2942af922815d..2c1af55ef793c2da2059f3bb7f9c11bee4a9dc92 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -49,6 +49,8 @@
 
 #define PRINT_CONNTREE 0
 
+static LDAP_REBIND_PROC        ldap_back_rebind;
+
 int
 ldap_back_bind(
     Backend            *be,
@@ -111,8 +113,19 @@ ldap_back_bind(
                lc->bound = 1;
        }
 
+       if ( li->savecred ) {
+               if ( lc->cred.bv_val )
+                       ch_free( lc->cred.bv_val );
+               ber_dupbv( &lc->cred, cred );
+               ldap_set_rebind_proc( lc->ld, ldap_back_rebind, lc );
+       }
+
+       if ( lc->bound_dn.bv_val )
+               ch_free( lc->bound_dn.bv_val );
        if ( mdn.bv_val != dn->bv_val ) {
-               free( mdn.bv_val );
+               lc->bound_dn = mdn;
+       } else {
+               ber_dupbv( &lc->bound_dn, dn );
        }
        
        return( rc );
@@ -130,8 +143,8 @@ ldap_back_conn_cmp(
        const void *c2
        )
 {
-       struct ldapconn *lc1 = (struct ldapconn *)c1;
-        struct ldapconn *lc2 = (struct ldapconn *)c2;
+       const struct ldapconn *lc1 = (const struct ldapconn *)c1;
+       const struct ldapconn *lc2 = (const struct ldapconn *)c2;
        
        return ( ( lc1->conn < lc2->conn ) ? -1 : ( ( lc1->conn > lc2-> conn ) ? 1 : 0 ) );
 }
@@ -219,6 +232,9 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                lc->conn = conn;
                lc->ld = ld;
 
+               lc->cred.bv_len = 0;
+               lc->cred.bv_val = NULL;
+
 #ifdef ENABLE_REWRITE
                /*
                 * Sets a cookie for the rewrite session
@@ -341,7 +357,7 @@ ldap_back_dobind(struct ldapconn *lc, Operation *op)
                return( lc->bound );
        }
 
-       if (ldap_bind_s(lc->ld, lc->bound_dn.bv_val, NULL, LDAP_AUTH_SIMPLE) !=
+       if (ldap_bind_s(lc->ld, lc->bound_dn.bv_val, lc->cred.bv_val, LDAP_AUTH_SIMPLE) !=
                LDAP_SUCCESS) {
                ldap_back_op_result(lc, op);
                return( 0 );
@@ -349,6 +365,21 @@ ldap_back_dobind(struct ldapconn *lc, Operation *op)
        return( lc->bound = 1 );
 }
 
+/*
+ * ldap_back_rebind
+ *
+ * This is a callback used for chasing referrals using the same
+ * credentials as the original user on this session.
+ */
+static int 
+ldap_back_rebind( LDAP *ld, LDAP_CONST char *url, ber_tag_t request,
+       ber_int_t msgid, void *params )
+{
+       struct ldapconn *lc = params;
+
+       return ldap_bind_s( ld, lc->bound_dn.bv_val, lc->cred.bv_val, LDAP_AUTH_SIMPLE );
+}
+
 /* Map API errors to protocol errors... */
 
 int