X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffrontend.c;h=f9cfe6f466137c0110dc178e324dc7c27704b8ae;hb=f1e2d35bd6cd10afd0a3a1f6041f871e4ec5a69b;hp=bf9635b8755a659ef468f279e7d15a0f71b24d08;hpb=5b193c218fcc45a909169a18500e49185fb71d52;p=openldap

diff --git a/servers/slapd/frontend.c b/servers/slapd/frontend.c
index bf9635b875..f9cfe6f466 100644
--- a/servers/slapd/frontend.c
+++ b/servers/slapd/frontend.c
@@ -86,8 +86,25 @@ frontend_init( void )
 	frontendDB->bd_info->bi_type = "frontend";
 
 	/* known controls */
-	frontendDB->bd_info->bi_controls = slap_known_controls;
-	frontendDB->be_controls = ldap_charray_dup( 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;