From: Howard Chu <hyc@openldap.org>
Date: Thu, 19 Aug 2004 12:10:22 +0000 (+0000)
Subject: ITS#3291 delay use of slap_known_controls until all configuration is done
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~687
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2ee179c3f14caa077e1a9e47072d31296f7be8b;p=openldap

ITS#3291 delay use of slap_known_controls until all configuration is done
---

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 458f95376b..d8240b6ca8 100644
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -46,14 +46,21 @@ int init_module(int argc, char *argv[]) {
 
 #endif /* SLAPD_LDAP */
 
+static int
+ldap_back_open(
+	BackendInfo *bi
+)
+{
+	bi->bi_controls = slap_known_controls;
+	return 0;
+}
+
 int
 ldap_back_initialize(
     BackendInfo	*bi
 )
 {
-	bi->bi_controls = slap_known_controls;
-
-	bi->bi_open = 0;
+	bi->bi_open = ldap_back_open;
 	bi->bi_config = 0;
 	bi->bi_close = 0;
 	bi->bi_destroy = 0;
diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index 8ed7cb7379..3b3decd93f 100644
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -42,14 +42,21 @@ init_module( int argc, char *argv[] ) {
 
 #endif /* SLAPD_META */
 
+static int
+meta_back_open(
+	BackendInfo *bi
+)
+{
+	bi->bi_controls = slap_known_controls;
+	return 0;
+}
+
 int
 meta_back_initialize(
 		BackendInfo	*bi
 )
 {
-	bi->bi_controls = slap_known_controls;
-
-	bi->bi_open = 0;
+	bi->bi_open = meta_back_open;
 	bi->bi_config = 0;
 	bi->bi_close = 0;
 	bi->bi_destroy = 0;