From a60c82b3ba37b334dc01e2d4e5a38655e9480fcc Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 19 Feb 2011 02:49:18 +0000 Subject: [PATCH] ITS#6837 olcChainDatabase inherits from olcLDAPConfig --- servers/slapd/back-ldap/chain.c | 2 +- servers/slapd/back-ldap/init.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c index 6bccc6a853..a55d93c2fe 100644 --- 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 bb05dd5d1c..60e60c5fe9 100644 --- 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 -- 2.39.5