Merge branch 'mdb.master' of /home/hyc/OD/mdb

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

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 3d0cc728f1fb7a2e767ca9e7cf985e3926615ecc..60e60c5fe9f1375d3e7b1fd0ae45f8d0ee2a18df 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2009 The OpenLDAP Foundation.
+ * Copyright 2003-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -36,6 +36,7 @@ static const ldap_extra_t ldap_extra = {
        ldap_back_proxy_authz_ctrl,
        ldap_back_controls_free,
        slap_idassert_authzfrom_parse_cf,
+       slap_idassert_passthru_parse_cf,
        slap_idassert_parse_cf,
        slap_retry_info_destroy,
        slap_retry_info_parse,
@@ -99,19 +100,28 @@ ldap_back_initialize( BackendInfo *bi )
 
        bi->bi_extra = (void *)&ldap_extra;
 
+       rc =  ldap_back_init_cf( bi );
+       if ( rc ) {
+               return rc;
+       }
+
        rc = chain_initialize();
        if ( rc ) {
                return rc;
        }
 
+       rc = pbind_initialize();
+       if ( rc ) {
+               return rc;
+       }
+
 #ifdef SLAP_DISTPROC
        rc = distproc_initialize();
        if ( rc ) {
                return rc;
        }
 #endif
-
-       return ldap_back_init_cf( bi );
+       return rc;
 }
 
 int
@@ -298,50 +308,11 @@ ldap_back_db_destroy( Backend *be, ConfigReply *cr )
                        ber_bvarray_free( li->li_bvuri );
                        li->li_bvuri = NULL;
                }
-               if ( !BER_BVISNULL( &li->li_acl_authcID ) ) {
-                       ch_free( li->li_acl_authcID.bv_val );
-                       BER_BVZERO( &li->li_acl_authcID );
-               }
-               if ( !BER_BVISNULL( &li->li_acl_authcDN ) ) {
-                       ch_free( li->li_acl_authcDN.bv_val );
-                       BER_BVZERO( &li->li_acl_authcDN );
-               }
-               if ( !BER_BVISNULL( &li->li_acl_passwd ) ) {
-                       ch_free( li->li_acl_passwd.bv_val );
-                       BER_BVZERO( &li->li_acl_passwd );
-               }
-               if ( !BER_BVISNULL( &li->li_acl_sasl_mech ) ) {
-                       ch_free( li->li_acl_sasl_mech.bv_val );
-                       BER_BVZERO( &li->li_acl_sasl_mech );
-               }
-               if ( !BER_BVISNULL( &li->li_acl_sasl_realm ) ) {
-                       ch_free( li->li_acl_sasl_realm.bv_val );
-                       BER_BVZERO( &li->li_acl_sasl_realm );
-               }
-               if ( !BER_BVISNULL( &li->li_idassert_authcID ) ) {
-                       ch_free( li->li_idassert_authcID.bv_val );
-                       BER_BVZERO( &li->li_idassert_authcID );
-               }
-               if ( !BER_BVISNULL( &li->li_idassert_authcDN ) ) {
-                       ch_free( li->li_idassert_authcDN.bv_val );
-                       BER_BVZERO( &li->li_idassert_authcDN );
-               }
-               if ( !BER_BVISNULL( &li->li_idassert_passwd ) ) {
-                       ch_free( li->li_idassert_passwd.bv_val );
-                       BER_BVZERO( &li->li_idassert_passwd );
-               }
-               if ( !BER_BVISNULL( &li->li_idassert_authzID ) ) {
-                       ch_free( li->li_idassert_authzID.bv_val );
-                       BER_BVZERO( &li->li_idassert_authzID );
-               }
-               if ( !BER_BVISNULL( &li->li_idassert_sasl_mech ) ) {
-                       ch_free( li->li_idassert_sasl_mech.bv_val );
-                       BER_BVZERO( &li->li_idassert_sasl_mech );
-               }
-               if ( !BER_BVISNULL( &li->li_idassert_sasl_realm ) ) {
-                       ch_free( li->li_idassert_sasl_realm.bv_val );
-                       BER_BVZERO( &li->li_idassert_sasl_realm );
-               }
+
+               bindconf_free( &li->li_tls );
+               bindconf_free( &li->li_acl );
+               bindconf_free( &li->li_idassert.si_bc );
+
                if ( li->li_idassert_authz != NULL ) {
                        ber_bvarray_free( li->li_idassert_authz );
                        li->li_idassert_authz = NULL;