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 8c2110b38359261365bfa11f2e10edd300abaa58..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,6 +100,11 @@ 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;
@@ -115,8 +121,7 @@ ldap_back_initialize( BackendInfo *bi )
                return rc;
        }
 #endif
-
-       return ldap_back_init_cf( bi );
+       return rc;
 }
 
 int