upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-28 10:39:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Got base entry...

Browse source
This commit is contained in:
Kurt Zeilenga 2000-09-26 19:26:08 +00:00
parent fcb3ccc526
commit dccdd30497
4 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servers/slapd/back-bdb/add.c
View file

@ -251,7 +251,7 @@ retry: rc = txn_abort( ltid );
ltid = NULL;
op->o_private = NULL;
if( rc == 0 ) {
if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE,
"bdb_add: txn_commit failed: %s (%d)\n",
db_strerror(rc), rc, 0 );

29
servers/slapd/back-bdb/dn2id.c
View file

@ -25,7 +25,8 @@ bdb_dn2id_add(
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", %ld )\n", dn, id, 0 );
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add( \"%s\", 0x%08lx )\n",
dn, id, 0 );
assert( id != NOID );
DBTzero( &key );
@ -111,7 +112,8 @@ bdb_dn2id_delete(
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
DB *db = bdb->bi_dn2id->bdi_db;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", %ld )\n", dn, id, 0 );
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete( \"%s\", 0x%08lx )\n",
dn, id, 0 );
DBTzero( &key );
key.size = strlen( dn ) + 2;
@ -210,7 +212,7 @@ bdb_dn2id(
/* fetch it */
rc = db->get( db, txn, &key, &data, 0 );
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: id=%ld: %s (%d)\n",
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: id=0x%08lx: %s (%d)\n",
id, db_strerror( rc ), rc );
ch_free( key.data );
@ -250,6 +252,8 @@ bdb_dn2id_matched(
while(1) {
AC_MEMCPY( &((char *)key.data)[1], dn, key.size - 1 );
*id = NOID;
/* fetch it */
rc = db->get( db, txn, &key, &data, 0 );
@ -259,6 +263,9 @@ bdb_dn2id_matched(
tmp = NULL;
if( pdn == NULL || *pdn == '\0' ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: no match\n",
0, 0, 0 );
ch_free( pdn );
break;
}
@ -268,15 +275,27 @@ bdb_dn2id_matched(
key.size = strlen( dn ) + 2;
} else if ( rc == 0 ) {
if( data.size != sizeof( ID ) ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get size mismatch: "
"expected %ld, got %ld\n",
(long) sizeof(ID), (long) data.size, 0 );
ch_free( tmp );
}
if( in != dn ) {
*matchedDN = (char *) dn;
}
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2id_matched: id=%ld: %s\n",
id, dn, 0 );
"<= bdb_dn2id_matched: id=0x%08lx: %s\n",
*id, dn, 0 );
break;
} else {
Debug( LDAP_DEBUG_ANY,
"<= bdb_dn2id_matched: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
ch_free( tmp );
break;
}

4
servers/slapd/back-bdb/id2entry.c
View file

@ -73,6 +73,10 @@ int bdb_id2entry(
rc = entry_decode( &bv, e );
if( rc == 0 ) {
(*e)->e_id = id;
}
ch_free( data.data );
return rc;
}

4
servers/slapd/back-bdb/search.c
View file

@ -361,7 +361,7 @@ static int base_candidate(
Entry *e,
ID *ids )
{
Debug(LDAP_DEBUG_TRACE, "base_candidates: base: \"%s\" (0x08lx)\n",
Debug(LDAP_DEBUG_ARGS, "base_candidates: base: \"%s\" (0x%08lx)\n",
e->e_dn, (long) e->e_id, 0);
ids[0] = 1;
@ -378,7 +378,7 @@ static int search_candidates(
int manageDSAit,
ID *ids )
{
Debug(LDAP_DEBUG_TRACE, "subtree_candidates: base: \"%s\" (0x08lx)\n",
Debug(LDAP_DEBUG_TRACE, "subtree_candidates: base: \"%s\" (0x%08lx)\n",
e->e_dn, (long) e->e_id, 0);
ids[0] = NOID;