X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffrontend.c;h=f9cfe6f466137c0110dc178e324dc7c27704b8ae;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=3ab670dcae0ce69c9d4e3b598580bfd4d2158ca8;hpb=dc0eacd40b625258355eea866d62188e5aa7ce3b;p=openldap

diff --git a/servers/slapd/frontend.c b/servers/slapd/frontend.c
index 3ab670dcae..f9cfe6f466 100644
--- a/servers/slapd/frontend.c
+++ b/servers/slapd/frontend.c
@@ -42,8 +42,8 @@
 #include "slapi/slapi.h"
 #endif
 
-BackendInfo	slap_frontendInfo;
-BackendDB	slap_frontendDB;
+static BackendInfo	slap_frontendInfo;
+static BackendDB	slap_frontendDB;
 BackendDB	*frontendDB;
 
 int
@@ -69,8 +69,6 @@ frontend_init( void )
 	/* FIXME: do we need this? */
 	frontendDB->be_pcl_mutexp = &frontendDB->be_pcl_mutex;
 	ldap_pvt_thread_mutex_init( frontendDB->be_pcl_mutexp );
-
-	LDAP_STAILQ_INIT( &frontendDB->be_syncinfo );
 #endif
 
 	/* suffix */
@@ -88,7 +86,25 @@ frontend_init( void )
 	frontendDB->bd_info->bi_type = "frontend";
 
 	/* known controls */
-	frontendDB->bd_info->bi_controls = slap_known_controls;
+	if ( slap_known_controls ) {
+		int	i;
+
+		frontendDB->bd_info->bi_controls = slap_known_controls;
+
+		for ( i = 0; slap_known_controls[ i ]; i++ ) {
+			int	cid;
+
+			if ( slap_find_control_id( slap_known_controls[ i ], &cid )
+					== LDAP_CONTROL_NOT_FOUND )
+			{
+				assert( 0 );
+				return -1;
+			}
+
+			frontendDB->bd_info->bi_ctrls[ cid ] = 1;
+			frontendDB->be_ctrls[ cid ] = 1;
+		}
+	}
 
 	/* calls */
 	frontendDB->bd_info->bi_op_abandon = fe_op_abandon;