mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#3616 fixes for zero-length DN entry. generate context entry on the

Browse Source 
fly if a modify is attempted and it does not exist.
This commit is contained in:
Howard Chu 2005-04-09 11:15:05 +00:00
parent 90d9791047
commit f43086d1c1
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/back-bdb/dn2entry.c
View File

@ -68,10 +68,12 @@ bdb_dn2entry(
*e = ei; *e = ei;
} else if ( matched && rc == DB_NOTFOUND ) { } else if ( matched && rc == DB_NOTFOUND ) {
/* always return EntryInfo */ /* always return EntryInfo */
ei = ei->bei_parent; if ( ei->bei_parent ) {
rc2 = bdb_cache_find_id( op, tid, ei->bei_id, &ei, 1, ei = ei->bei_parent;
locker, lock ); rc2 = bdb_cache_find_id( op, tid, ei->bei_id, &ei, 1,
if ( rc2 ) rc = rc2; locker, lock );
if ( rc2 ) rc = rc2;
}
*e = ei; *e = ei;
} }
} }

35
servers/slapd/back-bdb/modify.c
View File

@ -269,6 +269,7 @@ bdb_modify( Operation *op, SlapReply *rs )
DB_TXN *ltid = NULL, *lt2; DB_TXN *ltid = NULL, *lt2;
struct bdb_op_info opinfo = {0}; struct bdb_op_info opinfo = {0};
Entry dummy = {0}; Entry dummy = {0};
int fakeroot = 0;
u_int32_t locker = 0; u_int32_t locker = 0;
DB_LOCK lock; DB_LOCK lock;
@ -339,6 +340,8 @@ retry: /* transaction retry */
rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei, 1, rs->sr_err = bdb_dn2entry( op, ltid, &op->o_req_ndn, &ei, 1,
locker, &lock ); locker, &lock );
e = ei->bei_e;
if ( rs->sr_err != 0 ) { if ( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": dn2entry failed (%d)\n", LDAP_XSTRING(bdb_modify) ": dn2entry failed (%d)\n",
@ -348,6 +351,22 @@ retry: /* transaction retry */
case DB_LOCK_NOTGRANTED: case DB_LOCK_NOTGRANTED:
goto retry; goto retry;
case DB_NOTFOUND: case DB_NOTFOUND:
if ( BER_BVISEMPTY( &op->o_req_ndn )) {
struct berval ocbva[] = {
BER_BVC("locality"),
BER_BVC("syncProviderSubentry"),
BER_BVNULL
};
e = ch_calloc( 1, sizeof(Entry));
e->e_name.bv_val = ch_strdup( "" );
ber_dupbv( &e->e_nname, &e->e_name );
attr_merge( e, slap_schema.si_ad_objectClass, ocbva, NULL );
attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
&ocbva[0], NULL );
BEI(e) = ei;
fakeroot = 1;
rs->sr_err = 0;
}
break; break;
case LDAP_BUSY: case LDAP_BUSY:
rs->sr_text = "ldap server busy"; rs->sr_text = "ldap server busy";
@ -359,7 +378,6 @@ retry: /* transaction retry */
} }
} }
e = ei->bei_e;
/* acquire and lock entry */ /* acquire and lock entry */
/* FIXME: dn2entry() should return non-glue entry */ /* FIXME: dn2entry() should return non-glue entry */
if (( rs->sr_err == DB_NOTFOUND ) || if (( rs->sr_err == DB_NOTFOUND ) ||
@ -510,11 +528,16 @@ retry: /* transaction retry */
} else { } else {
/* may have changed in bdb_modify_internal() */ /* may have changed in bdb_modify_internal() */
e->e_ocflags = dummy.e_ocflags; e->e_ocflags = dummy.e_ocflags;
rc = bdb_cache_modify( e, dummy.e_attrs, bdb->bi_dbenv, locker, &lock ); if ( fakeroot ) {
switch( rc ) { BEI(e) = NULL;
case DB_LOCK_DEADLOCK: entry_free( e );
case DB_LOCK_NOTGRANTED: } else {
goto retry; rc = bdb_cache_modify( e, dummy.e_attrs, bdb->bi_dbenv, locker, &lock );
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
}
} }
dummy.e_attrs = NULL; dummy.e_attrs = NULL;