X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Ffrontend.c;h=f9cfe6f466137c0110dc178e324dc7c27704b8ae;hb=af866c3b44ba37577671f2bffd482499f4b8bc00;hp=0aedfc0e849eb4348977e879b56e17054ebb58e8;hpb=cd9a9c628dd08435dff10b25eb9c6de5f7f4a604;p=openldap

diff --git a/servers/slapd/frontend.c b/servers/slapd/frontend.c
index 0aedfc0e84..f9cfe6f466 100644
--- a/servers/slapd/frontend.c
+++ b/servers/slapd/frontend.c
@@ -1,7 +1,7 @@
 /* frontend.c - routines for dealing with frontend */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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
@@ -65,6 +65,12 @@ frontend_init( void )
 	frontendDB->be_def_limit.lms_s_pr_hide = 0;			/* don't hide number of entries left */
 	frontendDB->be_def_limit.lms_s_pr_total = 0;			/* number of total entries returned by pagedResults equal to hard limit */
 
+#if 0
+	/* FIXME: do we need this? */
+	frontendDB->be_pcl_mutexp = &frontendDB->be_pcl_mutex;
+	ldap_pvt_thread_mutex_init( frontendDB->be_pcl_mutexp );
+#endif
+
 	/* suffix */
 	frontendDB->be_suffix = ch_calloc( 2, sizeof( struct berval ) );
 	ber_str2bv( "", 0, 1, &frontendDB->be_suffix[0] );
@@ -80,9 +86,28 @@ 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;
 	frontendDB->bd_info->bi_op_add = fe_op_add;
 	frontendDB->bd_info->bi_op_bind = fe_op_bind;
 	frontendDB->bd_info->bi_op_compare = fe_op_compare;
@@ -92,6 +117,11 @@ frontend_init( void )
 	frontendDB->bd_info->bi_op_search = fe_op_search;
 	frontendDB->bd_info->bi_extended = fe_extended;
 
+#if 0
+	/* FIXME: is this too early? */
+	return backend_startup_one( frontendDB );
+#endif
+
 	return 0;
 }