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

This commit is contained in:
Jong Hyuk Choi 2003-02-07 15:59:24 +00:00
parent 55cf8bbd88
commit 82115be0fb
2 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -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