summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamen.mazdrashki@postpath.com>2010-01-07 04:01:14 +0200
committerAndrew Tridgell <tridge@samba.org>2010-01-08 13:03:04 +1100
commit6247a135c68b592d99a8c1594aebe5ca7e716d7c (patch)
tree49a3b1705a4d503d4a9520b2b79d65bd250d5131 /source4/dsdb
parent73838b353aadd221f011e42c1225bcd5cc07dc9d (diff)
downloadsamba-6247a135c68b592d99a8c1594aebe5ca7e716d7c.tar.gz
samba-6247a135c68b592d99a8c1594aebe5ca7e716d7c.tar.bz2
samba-6247a135c68b592d99a8c1594aebe5ca7e716d7c.zip
s4/schema: Do not assign msDS-IntId value if LDB_CONTROL_RELAX_OID is passed
This way msDS-IntId should not be assigned during provisioning, which is how Windows works
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_data.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_data.c b/source4/dsdb/samdb/ldb_modules/schema_data.c
index 2e99113953..8125a46cbb 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_data.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_data.c
@@ -290,6 +290,11 @@ static int schema_data_add(struct ldb_module *module, struct ldb_request *req)
}
}
+ /* bypass further processing if CONTROL_RELAX is set */
+ if (ldb_request_get_control(req, LDB_CONTROL_RELAX_OID)) {
+ return ldb_next_request(module, req);
+ }
+
/* generate and add msDS-IntId attr value */
if (attributeID
&& (dsdb_functional_level(ldb) >= DS_DOMAIN_FUNCTION_2003)