From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Fri, 7 Feb 2003 15:59:24 +0000 (+0000)
Subject: use of normalized dn (fix for a deadlock case ITS#2195)
X-Git-Tag: NO_SLAP_OP_BLOCKS~416
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=82115be0fbe3284744b02e374ca14c1fbf445a4c;p=openldap

use of normalized dn (fix for a deadlock case ITS#2195)
---

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index d2b2bb5a32..10ef737fae 100644
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -45,21 +45,21 @@ bdb_attribute(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( BACK_BDB, ARGS, 
-		"bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
+		"bdb_attribute: gr ndn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
 	LDAP_LOG( BACK_BDB, ARGS, 
 		"bdb_attribute: at: \"%s\"\n", entry_at_name, 0, 0);
-	LDAP_LOG( BACK_BDB, ARGS, "bdb_attribute: tr dn: \"%s\"\n",
+	LDAP_LOG( BACK_BDB, ARGS, "bdb_attribute: tr ndn: \"%s\"\n",
 		target ? target->e_ndn : "", 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ARGS,
-		"=> bdb_attribute: gr dn: \"%s\"\n",
+		"=> bdb_attribute: gr ndn: \"%s\"\n",
 		entry_ndn->bv_val, 0, 0 ); 
 	Debug( LDAP_DEBUG_ARGS,
 		"=> bdb_attribute: at: \"%s\"\n", 
 		entry_at_name, 0, 0 ); 
 
 	Debug( LDAP_DEBUG_ARGS,
-		"=> bdb_attribute: tr dn: \"%s\"\n",
+		"=> bdb_attribute: tr ndn: \"%s\"\n",
 		target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index e0099af0c3..4b854fd516 100644
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -73,7 +73,7 @@ bdb_group(
 
 	Debug( LDAP_DEBUG_ARGS,
 		"=> bdb_group: tr ndn: \"%s\"\n",
-		target->e_ndn, 0, 0 ); 
+		target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
 	if( op ) boi = (struct bdb_op_info *) op->o_private;
@@ -95,7 +95,7 @@ bdb_group(
 		}
 	}
 
-	if (dn_match(&target->e_name, gr_ndn)) {
+	if ( target != NULL && dn_match( &target->e_nname, gr_ndn )) {
 		/* we already have a LOCKED copy of the entry */
 		e = target;
 #ifdef NEW_LOGGING