sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-25 00:23:52 +03:00
Code Activity

r25762: This test belongs best with the other checks for a valid parent, in

Browse Source 
the objectclass module.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2007-10-31 04:41:36 +01:00
committed by Stefan Metzmacher
parent 958a92ed0c
commit 16a292fcb1
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/dsdb/samdb/ldb_modules/objectclass.c
View File

@@ -865,6 +865,14 @@ static int objectclass_rename(struct ldb_module *module, struct ldb_request *req
if (ldb_dn_is_special(req->op.rename.newdn)) { /* do not manipulate our control entries */ if (ldb_dn_is_special(req->op.rename.newdn)) { /* do not manipulate our control entries */
return ldb_next_request(module, req); return ldb_next_request(module, req);
} }
/* Firstly ensure we are not trying to rename it to be a child of itself */
if ((ldb_dn_compare_base(req->op.rename.olddn, req->op.rename.newdn) == 0)
&& (ldb_dn_compare(req->op.rename.olddn, req->op.rename.newdn) != 0)) {
ldb_asprintf_errstring(module->ldb, "Cannot rename %s to be a child of itself",
ldb_dn_get_linearized(req->op.rename.olddn));
return LDB_ERR_UNWILLING_TO_PERFORM;
}
h = oc_init_handle(req, module); h = oc_init_handle(req, module);
if (!h) { if (!h) {

8
source/dsdb/samdb/ldb_modules/subtree_rename.c
View File

@@ -163,14 +163,6 @@ static int subtree_rename(struct ldb_module *module, struct ldb_request *req)
return ldb_next_request(module, req); return ldb_next_request(module, req);
} }
/* Firstly ensure we are not trying to rename it to be a child of itself */
if ((ldb_dn_compare_base(req->op.rename.olddn, req->op.rename.newdn) == 0)
&& (ldb_dn_compare(req->op.rename.olddn, req->op.rename.newdn) != 0)) {
ldb_asprintf_errstring(module->ldb, "Cannot rename %s to be a child of itself",
ldb_dn_get_linearized(req->op.rename.olddn));
return LDB_ERR_UNWILLING_TO_PERFORM;
}
/* This gets complex: We need to: /* This gets complex: We need to:
- Do a search for all entires under this entry - Do a search for all entires under this entry
- Wait for these results to appear - Wait for these results to appear

7
testprogs/ejs/ldap.js
View File

@@ -295,6 +295,13 @@ cn: LDAPtestUSER4
assert(ok.error == 53); assert(ok.error == 53);
} }
println("Testing ldb.rename (into non-existent container) of cn=ldaptestcontainer2," + base_dn + " to cn=ldaptestcontainer,cn=ldaptestcontainer3," + base_dn);
ok = ldb.rename("cn=ldaptestcontainer2," + base_dn, "cn=ldaptestcontainer,cn=ldaptestcontainer3," + base_dn);
if (ok.error != 53 && ok.error != 80) { /* LDAP_UNWILLING_TO_PERFORM or LDAP_OTHER*/
println(ok.errstr);
assert(ok.error == 53 || ok.error == 80);
}
println("Testing delete (should fail, not a leaf node) of renamed cn=ldaptestcontainer2," + base_dn); println("Testing delete (should fail, not a leaf node) of renamed cn=ldaptestcontainer2," + base_dn);
ok = ldb.del("cn=ldaptestcontainer2," + base_dn); ok = ldb.del("cn=ldaptestcontainer2," + base_dn);
if (ok.error != 66) { /* LDB_ERR_NOT_ALLOWED_ON_NON_LEAF */ if (ok.error != 66) { /* LDB_ERR_NOT_ALLOWED_ON_NON_LEAF */