X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbackend.c;h=530410362cc165631370bde305185b41f1baa2bd;hb=f89308915aabff352eb390a1e58a71127b7ebd26;hp=7eec0d624f0cfa7839586710053d6494dbd7fecc;hpb=5ee89d616797a8a62fa44dec95c52e2b94e8c83f;p=openldap

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 7eec0d624f..530410362c 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 */
@@ -241,11 +241,11 @@ int backend_startup(Backend *be)
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
 			   "backend_startup:  starting \"%s\"\n",
-			   be->be_suffix[0] ));
+			   be->be_suffix[0]->bv_val ));
 #else
 		Debug( LDAP_DEBUG_TRACE,
 			"backend_startup: starting \"%s\"\n",
-			be->be_suffix[0], 0, 0 );
+			be->be_suffix[0]->bv_val, 0, 0 );
 #endif
 
 		if ( be->bd_info->bi_open ) {
@@ -410,19 +410,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 );
 		}
-		charray_free( 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 );
 
@@ -521,21 +521,23 @@ be_db_close( void )
 
 Backend *
 select_backend(
-	const char * dn,
+	struct berval * dn,
 	int manageDSAit,
 	int noSubs )
 {
-	int	i, j, len, dnlen;
+	int	i, j;
+	ber_len_t len, dnlen = dn->bv_len;
 	Backend *be = NULL;
 
-	dnlen = strlen( dn );
 	for ( i = 0; i < nbackends; i++ ) {
 		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;
 
@@ -543,15 +545,18 @@ select_backend(
 				/* suffix is longer than DN */
 				continue;
 			}
-
 			
-			if ( len && len < dnlen && ( !DN_SEPARATOR( dn[(dnlen-len)-1] ) || DN_ESCAPE( dn[(dnlen-len)-2] ) ) ) {
+			if ( len && len < dnlen &&
+				( !DN_SEPARATOR( dn->bv_val[(dnlen-len)-1] ) ||
+					DN_ESCAPE( dn->bv_val[(dnlen-len)-2] ) ) )
+			{
 				/* make sure we have a separator */
 				continue;
 			}
-		        
 
-			if ( strcmp( backends[i].be_nsuffix[j]->bv_val, &dn[dnlen-len] ) == 0 ) {
+			if ( strcmp( backends[i].be_nsuffix[j]->bv_val,
+				&dn->bv_val[dnlen-len] ) == 0 )
+			{
 				if( be == NULL ) {
 					be = &backends[i];
 
@@ -591,11 +596,9 @@ be_issuffix(
 }
 
 int
-be_isroot( Backend *be, const char *ndn )
+be_isroot( Backend *be, struct berval *ndn )
 {
-	int rc;
-
-	if ( ndn == NULL || *ndn == '\0' ) {
+	if ( !ndn->bv_len ) {
 		return( 0 );
 	}
 
@@ -603,9 +606,7 @@ be_isroot( Backend *be, const char *ndn )
 		return( 0 );
 	}
 
-	rc = strcmp( be->be_rootndn.bv_val, ndn ) ? 0 : 1;
-
-	return(rc);
+	return dn_match( &be->be_rootndn, ndn );
 }
 
 int
@@ -619,23 +620,19 @@ 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 );
 }
 
-char *
+struct berval *
 be_root_dn( Backend *be )
 {
-	if ( !be->be_rootdn.bv_len ) {
-		return( "" );
-	}
-
-	return be->be_rootdn.bv_val;
+	return &be->be_rootdn;
 }
 
 int
 be_isroot_pw( Backend *be,
 	Connection *conn,
-	const char *ndn,
+	struct berval *ndn,
 	struct berval *cred )
 {
 	int result;
@@ -957,8 +954,8 @@ int backend_check_referrals(
 	Backend *be,
 	Connection *conn,
 	Operation *op,
-	const char *dn,
-	const char *ndn )
+	struct berval *dn,
+	struct berval *ndn )
 {
 	int rc = LDAP_SUCCESS;
 
@@ -983,27 +980,25 @@ backend_group(
 	Connection *conn,
 	Operation *op,
 	Entry	*target,
-	const char	*gr_ndn,
-	const char	*op_ndn,
+	struct berval *gr_ndn,
+	struct berval *op_ndn,
 	ObjectClass *group_oc,
 	AttributeDescription *group_at
 )
 {
 	GroupAssertion *g;
-	int len = strlen(gr_ndn);
 	int i;
 
 	ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
 	i = op->o_abandon;
 	ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
-	if (i)
-		return SLAPD_ABANDON;
+	if (i) return SLAPD_ABANDON;
 
-	if( strcmp( target->e_ndn, gr_ndn ) != 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 = select_backend( gr_ndn, 0,
+			(be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
 
 		if (be == NULL) {
 			return LDAP_NO_SUCH_OBJECT;
@@ -1013,9 +1008,9 @@ 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 != len)
+		    g->len != gr_ndn->bv_len)
 			continue;
-		if (strcmp( g->ndn, gr_ndn ) == 0)
+		if (strcmp( g->ndn, gr_ndn->bv_val ) == 0)
 			break;
 	}
 	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
@@ -1028,13 +1023,13 @@ backend_group(
 			group_oc, group_at );
 		
 		if (op->o_tag != LDAP_REQ_BIND) {
-			g = ch_malloc(sizeof(GroupAssertion) + len);
+			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 = len;
-			strcpy(g->ndn, gr_ndn);
+			g->len = gr_ndn->bv_len;
+			strcpy(g->ndn, gr_ndn->bv_val);
 			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 			g->next = conn->c_groups;
 			conn->c_groups = g;
@@ -1053,18 +1048,16 @@ backend_attribute(
 	Connection *conn,
 	Operation *op,
 	Entry	*target,
-	const char	*entry_ndn,
+	struct berval	*edn,
 	AttributeDescription *entry_at,
-	struct berval ***vals
+	BerVarray *vals
 )
 {
-	if( target == NULL ||
-		strcmp( target->e_ndn, entry_ndn ) != 0 )
-	{
+	if ( target == NULL || !dn_match( &target->e_nname, edn ) ) {
 		/* we won't attempt to send it to a different backend */
 		
-		be = select_backend(entry_ndn, 0,
-			(be->be_glueflags & SLAP_GLUE_INSTANCE));
+		be = select_backend( edn, 0,
+			(be->be_flags & SLAP_BFLAG_GLUE_INSTANCE));
 
 		if (be == NULL) {
 			return LDAP_NO_SUCH_OBJECT;
@@ -1072,7 +1065,7 @@ backend_attribute(
 	} 
 
 	if( be->be_attribute ) {
-		return be->be_attribute( be, conn, op, target, entry_ndn,
+		return be->be_attribute( be, conn, op, target, edn,
 			entry_at, vals );
 	}
 
@@ -1084,7 +1077,7 @@ Attribute *backend_operational(
 	Connection *conn,
 	Operation *op,
 	Entry *e,
-	char **attrs,
+	AttributeName *attrs,
 	int opattrs	)
 {
 	Attribute *a = NULL, **ap = &a;
@@ -1100,8 +1093,7 @@ Attribute *backend_operational(
 	 * add them to the attribute list
 	 */
 	if ( ( opattrs || attrs ) && be && be->be_operational != NULL ) {
-		( void )be->be_operational( be, conn, op, e, 
-					    attrs, opattrs, ap );
+		( void )be->be_operational( be, conn, op, e, attrs, opattrs, ap );
 	}
 
 	return a;