X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackend.c;h=297ec308f981b42310a28d01602493c1054d15bb;hb=d23c55964651929e7b2b5a1730b33efee9661033;hp=39d528e776e109d43e3554aefd4709574c2cf91f;hpb=d474789d0dec6dc481156b2c78ffe8545987bdbb;p=openldap

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 39d528e776..297ec308f9 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* backend.c - routines for dealing with back-end databases */
@@ -272,11 +272,11 @@ int backend_startup(Backend *be)
 		if(rc != 0) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-				   "backend_startup: bi_db_open failed!\n" ));
+				"backend_startup: bi_db_open failed! (%d)\n", rc ));
 #else
 			Debug( LDAP_DEBUG_ANY,
-				"backend_startup: bi_db_open failed!\n",
-				0, 0, 0 );
+				"backend_startup: bi_db_open failed! (%d)\n",
+				rc, 0, 0 );
 #endif
 			return rc;
 		}
@@ -322,11 +322,12 @@ int backend_startup(Backend *be)
 		if(rc != 0) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
-				   "backend_startup: bi_db_open %d failed!\n", i ));
+				"backend_startup: bi_db_open(%d) failed! (%d)\n",
+				i, rc ));
 #else
 			Debug( LDAP_DEBUG_ANY,
-				"backend_startup: bi_db_open %d failed!\n",
-				i, 0, 0 );
+				"backend_startup: bi_db_open(%d) failed! (%d)\n",
+				i, rc, 0 );
 #endif
 			return rc;
 		}
@@ -410,19 +411,19 @@ int backend_shutdown( Backend *be )
 int backend_destroy(void)
 {
 	int i;
+	BackendDB *bd;
 
 	/* destroy each backend database */
-	for( i = 0; i < nBackendDB; i++ ) {
-		if ( backendDB[i].bd_info->bi_db_destroy ) {
-			backendDB[i].bd_info->bi_db_destroy(
-				&backendDB[i] );
+	for( i = 0, bd = backendDB; i < nBackendDB; i++, bd++ ) {
+		if ( bd->bd_info->bi_db_destroy ) {
+			bd->bd_info->bi_db_destroy( bd );
 		}
-		ber_bvecfree( backendDB[i].be_suffix );
-		ber_bvecfree( backendDB[i].be_nsuffix );
-		free( backendDB[i].be_rootdn.bv_val );
-		free( backendDB[i].be_rootndn.bv_val );
-		free( backendDB[i].be_rootpw.bv_val );
-		acl_destroy( backendDB[i].be_acl, global_acl );
+		ber_bvecfree( bd->be_suffix );
+		ber_bvecfree( bd->be_nsuffix );
+		if ( bd->be_rootdn.bv_val ) free( bd->be_rootdn.bv_val );
+		if ( bd->be_rootndn.bv_val ) free( bd->be_rootndn.bv_val );
+		if ( bd->be_rootpw.bv_val ) free( bd->be_rootpw.bv_val );
+		acl_destroy( bd->be_acl, global_acl );
 	}
 	free( backendDB );
 
@@ -489,6 +490,7 @@ backend_db_init(
 
 	be->be_restrictops = global_restrictops;
 	be->be_requires = global_requires;
+	be->be_ssf_set = global_ssf_set;
 
  	/* assign a default depth limit for alias deref */
 	be->be_max_deref_depth = SLAPD_DEFAULT_MAXDEREFDEPTH; 
@@ -533,9 +535,11 @@ select_backend(
 		for ( j = 0; backends[i].be_nsuffix != NULL &&
 		    backends[i].be_nsuffix[j] != NULL; j++ )
 		{
-			if ((backends[i].be_glueflags&SLAP_GLUE_SUBORDINATE)&&
-				noSubs)
+			if (( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE )
+				&& noSubs )
+			{
 			  	continue;
+			}
 
 			len = backends[i].be_nsuffix[j]->bv_len;
 
@@ -575,17 +579,13 @@ select_backend(
 int
 be_issuffix(
     Backend	*be,
-    const char	*suffix
+    struct berval	*bvsuffix
 )
 {
 	int	i;
-	size_t len = strlen(suffix);
 
 	for ( i = 0; be->be_nsuffix != NULL && be->be_nsuffix[i] != NULL; i++ ) {
-		if ( len != be->be_nsuffix[i]->bv_len ) {
-			continue;
-		}
-		if ( strcmp( be->be_nsuffix[i]->bv_val, suffix ) == 0 ) {
+		if ( ber_bvcmp( be->be_nsuffix[i], bvsuffix ) == 0 ) {
 			return( 1 );
 		}
 	}
@@ -604,7 +604,7 @@ be_isroot( Backend *be, struct berval *ndn )
 		return( 0 );
 	}
 
-	return strcmp( be->be_rootndn.bv_val, ndn->bv_val ) ? 0 : 1;
+	return dn_match( &be->be_rootndn, ndn );
 }
 
 int
@@ -618,7 +618,7 @@ be_isupdate( Backend *be, struct berval *ndn )
 		return( 0 );
 	}
 
-	return strcmp( be->be_update_ndn.bv_val, ndn->bv_val ) ? 0 : 1;
+	return dn_match( &be->be_update_ndn, ndn );
 }
 
 struct berval *
@@ -746,7 +746,7 @@ backend_check_controls(
 		if( (*ctrls)->ldctl_iscritical &&
 			!charray_inlist( be->be_controls, (*ctrls)->ldctl_oid ) )
 		{
-			*text = "control unavailable in NamingContext";
+			*text = "control unavailable in context";
 			return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
 		}
 	}
@@ -892,7 +892,7 @@ backend_check_restrictions(
 
 		if( requires & SLAP_REQUIRE_STRONG ) {
 			/* should check mechanism */
-			if( op->o_authmech == NULL || op->o_dn.bv_len == 0 )
+			if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 )
 			{
 				*text = "strong authentication required";
 				return LDAP_STRONG_AUTH_REQUIRED;
@@ -900,7 +900,7 @@ backend_check_restrictions(
 		}
 
 		if( requires & SLAP_REQUIRE_SASL ) {
-			if( op->o_authmech == NULL || op->o_dn.bv_len == 0 )
+			if( op->o_authmech.bv_len == 0 || op->o_dn.bv_len == 0 )
 			{
 				*text = "SASL authentication required";
 				return LDAP_STRONG_AUTH_REQUIRED;
@@ -961,7 +961,7 @@ int backend_check_referrals(
 		const char *text;
 
 		rc = be->be_chk_referrals( be,
-			conn, op, dn->bv_val, ndn->bv_val, &text );
+			conn, op, dn, ndn, &text );
 
 		if( rc != LDAP_SUCCESS && rc != LDAP_REFERRAL ) {
 			send_ldap_result( conn, op, rc,
@@ -992,12 +992,11 @@ backend_group(
 	ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
 	if (i) return SLAPD_ABANDON;
 
-	if( target->e_nname.bv_len != gr_ndn->bv_len ||
-		strcmp( target->e_nname.bv_val, gr_ndn->bv_val ) != 0 ) {
+	if ( !dn_match( &target->e_nname, gr_ndn ) ) {
 		/* we won't attempt to send it to a different backend */
 		
 		be = select_backend( gr_ndn, 0,
-			(be->be_glueflags & SLAP_GLUE_INSTANCE));
+			(be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
 
 		if (be == NULL) {
 			return LDAP_NO_SUCH_OBJECT;
@@ -1005,32 +1004,33 @@ backend_group(
 	} 
 
 	ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-	for (g = conn->c_groups; g; g=g->next) {
-		if (g->be != be || g->oc != group_oc || g->at != group_at ||
-		    g->len != gr_ndn->bv_len)
+	for (g = conn->c_groups; g; g=g->ga_next) {
+		if (g->ga_be != be || g->ga_oc != group_oc ||
+			g->ga_at != group_at || g->ga_len != gr_ndn->bv_len)
 			continue;
-		if (strcmp( g->ndn, gr_ndn->bv_val ) == 0)
+		if (strcmp( g->ga_ndn, gr_ndn->bv_val ) == 0)
 			break;
 	}
 	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-	if (g)
-		return g->res;
+	if (g) {
+		return g->ga_res;
+	}
 
 	if( be->be_group ) {
 		int res = be->be_group( be, conn, op,
-			target, gr_ndn->bv_val, op_ndn->bv_val,
+			target, gr_ndn, op_ndn,
 			group_oc, group_at );
 		
 		if (op->o_tag != LDAP_REQ_BIND) {
 			g = ch_malloc(sizeof(GroupAssertion) + gr_ndn->bv_len);
-			g->be = be;
-			g->oc = group_oc;
-			g->at = group_at;
-			g->res = res;
-			g->len = gr_ndn->bv_len;
-			strcpy(g->ndn, gr_ndn->bv_val);
+			g->ga_be = be;
+			g->ga_oc = group_oc;
+			g->ga_at = group_at;
+			g->ga_res = res;
+			g->ga_len = gr_ndn->bv_len;
+			strcpy(g->ga_ndn, gr_ndn->bv_val);
 			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-			g->next = conn->c_groups;
+			g->ga_next = conn->c_groups;
 			conn->c_groups = g;
 			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 		}
@@ -1049,16 +1049,14 @@ backend_attribute(
 	Entry	*target,
 	struct berval	*edn,
 	AttributeDescription *entry_at,
-	struct berval ***vals
+	BerVarray *vals
 )
 {
-	if( target == NULL || target->e_nname.bv_len != edn->bv_len ||
-		strcmp( target->e_ndn, edn->bv_val ) != 0 )
-	{
+	if ( target == NULL || !dn_match( &target->e_nname, edn ) ) {
 		/* we won't attempt to send it to a different backend */
 		
 		be = select_backend( edn, 0,
-			(be->be_glueflags & SLAP_GLUE_INSTANCE));
+			(be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
 
 		if (be == NULL) {
 			return LDAP_NO_SUCH_OBJECT;
@@ -1066,7 +1064,7 @@ backend_attribute(
 	} 
 
 	if( be->be_attribute ) {
-		return be->be_attribute( be, conn, op, target, edn->bv_val,
+		return be->be_attribute( be, conn, op, target, edn,
 			entry_at, vals );
 	}
 
@@ -1078,7 +1076,7 @@ Attribute *backend_operational(
 	Connection *conn,
 	Operation *op,
 	Entry *e,
-	struct berval **attrs,
+	AttributeName *attrs,
 	int opattrs	)
 {
 	Attribute *a = NULL, **ap = &a;