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 d2b2bb5a322a9cb277c5f5bd2ee48329e3e06eb9..10ef737faecd7d5edd2b73b915d41bb07e395e47 100644 (file)
--- 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 e0099af0c3d9d524770c628a68a80b61b922fa68..4b854fd516cb9f35c95f73f7fe8afd2f5548ad76 100644 (file)
--- 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