summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-02 21:42:06 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-07 14:47:20 +0200
commitc6020ccb87337b9045c51674d4d01c19f43fd288 (patch)
tree1bb22828d22087c2326b168cec69b9ac889a5e8b
parent95da72432560c042400faccb7f16d9ab9cd38df1 (diff)
downloadsamba-c6020ccb87337b9045c51674d4d01c19f43fd288.tar.gz
samba-c6020ccb87337b9045c51674d4d01c19f43fd288.tar.bz2
samba-c6020ccb87337b9045c51674d4d01c19f43fd288.zip
s4:objectclass LDB module - remove duplicated code
-rw-r--r--source4/dsdb/samdb/ldb_modules/objectclass.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index ad17a029d5..53863b61df 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -584,19 +584,10 @@ static int objectclass_do_add(struct oc_context *ac)
/* We don't know this class? what is going on? */
continue;
}
- if (ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) {
- for (j=0; sclass->systemPossibleInferiors && sclass->systemPossibleInferiors[j]; j++) {
- if (ldb_attr_cmp(objectclass->lDAPDisplayName, sclass->systemPossibleInferiors[j]) == 0) {
- allowed_class = true;
- break;
- }
- }
- } else {
- for (j=0; sclass->systemPossibleInferiors && sclass->systemPossibleInferiors[j]; j++) {
- if (ldb_attr_cmp(objectclass->lDAPDisplayName, sclass->systemPossibleInferiors[j]) == 0) {
- allowed_class = true;
- break;
- }
+ for (j=0; sclass->systemPossibleInferiors && sclass->systemPossibleInferiors[j]; j++) {
+ if (ldb_attr_cmp(objectclass->lDAPDisplayName, sclass->systemPossibleInferiors[j]) == 0) {
+ allowed_class = true;
+ break;
}
}
}