ITS#6837 olcChainDatabase inherits from olcLDAPConfig

diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index 6bccc6a853a5fbfc469c8f4751b37083b7edcbd1..a55d93c2feb1b1174477bf820b2f6c096c0eccbd 100644 (file)
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -1269,7 +1269,7 @@ static ConfigOCs chainocs[] = {
        { "( OLcfgOvOc:3.2 "
                "NAME 'olcChainDatabase' "
                "DESC 'Chain remote server configuration' "
-               "AUXILIARY )",
+               "SUP olcLDAPConfig )",
                Cft_Misc, olcDatabaseDummy, chain_ldadd },
        { NULL, 0, NULL }
 };

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index bb05dd5d1c97f193903b16df3de82c03cc2ec013..60e60c5fe9f1375d3e7b1fd0ae45f8d0ee2a18df 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -100,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;
@@ -116,8 +121,7 @@ ldap_back_initialize( BackendInfo *bi )
                return rc;
        }
 #endif
-
-       return ldap_back_init_cf( bi );
+       return rc;
 }
 
 int