mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add start of subentry support... still need to sort out

Browse Source 
administrativeRole restricts.
This commit is contained in:
Kurt Zeilenga 2002-01-10 18:18:37 +00:00
parent 0a194f2fa1
commit f662a39d41
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
servers/slapd/back-bdb/add.c
View File

@ -30,6 +30,7 @@ bdb_add(
AttributeDescription *children = slap_schema.si_ad_children; AttributeDescription *children = slap_schema.si_ad_children;
DB_TXN *ltid = NULL; DB_TXN *ltid = NULL;
struct bdb_op_info opinfo; struct bdb_op_info opinfo;
int subentry;
Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0); Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
@ -42,6 +43,8 @@ bdb_add(
goto return_results; goto return_results;
} }
subentry = is_entry_subentry( e );
/* /*
* acquire an ID outside of the operation transaction * acquire an ID outside of the operation transaction
* to avoid serializing adds. * to avoid serializing adds.
@ -94,10 +97,11 @@ retry: rc = txn_abort( ltid );
* add the entry. * add the entry.
*/ */
pdn.bv_val = dn_parent( be, e->e_ndn ); pdn.bv_val = dn_parent( be, e->e_ndn );
if (pdn.bv_val && *pdn.bv_val) if (pdn.bv_val && *pdn.bv_val) {
pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn); pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn);
else } else {
pdn.bv_len = 0; pdn.bv_len = 0;
}
if( pdn.bv_len != 0 ) { if( pdn.bv_len != 0 ) {
Entry *matched = NULL; Entry *matched = NULL;
@ -157,6 +161,15 @@ retry: rc = txn_abort( ltid );
goto return_results;; goto return_results;;
} }
if ( is_entry_subentry( p ) ) {
/* parent is a subentry, don't allow add */
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
0, 0, 0 );
rc = LDAP_OBJECT_CLASS_VIOLATION;
text = "parent is a subentry";
goto return_results;;
}
if ( is_entry_alias( p ) ) { if ( is_entry_alias( p ) ) {
/* parent is an alias, don't allow add */ /* parent is an alias, don't allow add */
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n", Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
@ -184,6 +197,11 @@ retry: rc = txn_abort( ltid );
goto done; goto done;
} }
if ( subentry ) {
/* FIXME: */
/* parent must be an administrative point of the required kind */
}
/* free parent and writer lock */ /* free parent and writer lock */
bdb_entry_return( be, p ); bdb_entry_return( be, p );
p = NULL; p = NULL;
@ -191,8 +209,7 @@ retry: rc = txn_abort( ltid );
} else { } else {
/* /*
* no parent! * no parent!
* must be adding entry to at suffix * must be adding entry at suffix or with parent ""
* or with parent ""
*/ */
if ( !be_isroot( be, &op->o_ndn )) { if ( !be_isroot( be, &op->o_ndn )) {
if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) { if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
@ -220,6 +237,15 @@ retry: rc = txn_abort( ltid );
goto return_results; goto return_results;
} }
} }
if( subentry ) {
Debug( LDAP_DEBUG_TRACE,
"bdb_add: no parent, cannot add subentry\n",
0, 0, 0 );
rc = LDAP_INSUFFICIENT_ACCESS;
text = "no parent, cannot add subentry";
goto return_results;;
}
} }
/* dn2id index */ /* dn2id index */