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 582c8e40c6ea0884df7b197f2b8d59bd00db41e7..2c1af55ef793c2da2059f3bb7f9c11bee4a9dc92 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -1,7 +1,7 @@
 /* bind.c - ldap backend bind function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -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
@@ -226,7 +242,7 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                ( void )rewrite_session_init( li->rwinfo, conn );
 #endif /* ENABLE_REWRITE */
 
-               if ( lc->conn->c_cdn != NULL && lc->conn->c_cdn[0] != '\0' ) {
+               if ( lc->conn->c_cdn.bv_len != 0 ) {
                        
                        /*
                         * Rewrite the bind dn if needed
@@ -235,24 +251,23 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                        lc->bound_dn.bv_val = NULL;
                        lc->bound_dn.bv_len = 0;
                        switch ( rewrite_session( li->rwinfo, "bindDn",
-                                               lc->conn->c_cdn, conn,
+                                               lc->conn->c_cdn.bv_val, conn,
                                                &lc->bound_dn.bv_val ) ) {
                        case REWRITE_REGEXEC_OK:
                                if ( lc->bound_dn.bv_val == NULL ) {
-                                       lc->bound_dn.bv_val = 
-                                               ch_strdup( lc->conn->c_cdn );
+                                       ber_dupbv( &lc->bound_dn, &lc->conn->c_cdn );
                                }
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
                                                "[rw] bindDn: \"%s\" ->"
                                                " \"%s\"\n%s",
-                                               lc->conn->c_cdn,
+                                               lc->conn->c_cdn.bv_val,
                                                lc->bound_dn.bv_val ));
 #else /* !NEW_LOGGING */
                                Debug( LDAP_DEBUG_ARGS,
                                                "rw> bindDn: \"%s\" ->"
                                                " \"%s\"\n%s",
-                                               lc->conn->c_cdn,
+                                               lc->conn->c_cdn.bv_val,
                                                lc->bound_dn.bv_val, "" );
 #endif /* !NEW_LOGGING */
                                break;
@@ -273,8 +288,11 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                        }
 #else /* !ENABLE_REWRITE */
                        struct berval bv;
-                       ber_str2bv( lc->conn->c_cdn, 0, 0, &bv );
-                       ldap_back_dn_massage( li, &bv, &lc->bound_dn, 0, 1 );
+                       ldap_back_dn_massage( li, &lc->conn->c_cdn, &bv, 0, 1 );
+                       if ( bv.bv_val == lc->conn->c_cdn.bv_val )
+                               ber_dupbv( &lc->bound_dn, &bv );
+                       else
+                               lc->bound_dn = bv;
 #endif /* !ENABLE_REWRITE */
                } else {
                        lc->bound_dn.bv_val = NULL;
@@ -339,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 );
@@ -347,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
@@ -409,8 +442,13 @@ ldap_back_op_result(struct ldapconn *lc, Operation *op)
 #ifdef ENABLE_REWRITE
        
        /*
-        * need rewrite info; mmmh ...
+        * FIXME: need rewrite info for match; mmmh ...
         */
+       send_ldap_result( lc->conn, op, err, match, msg, NULL, NULL );
+       /* better test the pointers before freeing? */
+       if ( match ) {
+               free( match );
+       }
 
 #else /* !ENABLE_REWRITE */
 
@@ -419,6 +457,7 @@ ldap_back_op_result(struct ldapconn *lc, Operation *op)
        if ( match ) {
                free( match );
        }
+
 #endif /* !ENABLE_REWRITE */
 
        if ( msg ) free( msg );