s4:samdb:rootdse: implement the schemaUpgradeInProgress operation in ldap modify

This is preliminary in that it is implemented as a no-op for a start
just to be able to successfully answer the request, which seems to be
sufficient in order to e.g. survive the exchange schema extensions.

Signed-off-by: Matthieu Patou <mat@matws.net>
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Apr 18 02:48:28 CEST 2012 on sn-devel-104

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 46dbb75b371828dac61ebe41929f5662fe55b8c4..f7c9896a8eca869c4b5249ada69b0cc4a2f5b3d5 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -1209,6 +1209,36 @@ static int rootdse_schemaupdatenow(struct ldb_module *module, struct ldb_request
        return ldb_module_done(req, NULL, NULL, ret);
 }
 
+static int rootdse_schemaupgradeinprogress(struct ldb_module *module, struct ldb_request *req)
+{
+       struct ldb_context *ldb = ldb_module_get_ctx(module);
+       struct ldb_result *ext_res;
+       int ret = LDB_SUCCESS;
+       struct ldb_dn *schema_dn;
+
+       schema_dn = ldb_get_schema_basedn(ldb);
+       if (!schema_dn) {
+               ldb_reset_err_string(ldb);
+               ldb_debug(ldb, LDB_DEBUG_WARNING,
+                         "rootdse_modify: no schema dn present: (skip ldb_extended call)\n");
+               return ldb_next_request(module, req);
+       }
+
+       /* FIXME we have to do something in order to relax constraints for DRS
+        * setting schemaUpgradeInProgress cause the fschemaUpgradeInProgress
+        * in all LDAP connection (2K3/2K3R2) or in the current connection (2K8 and +)
+        * to be set to true.
+        */
+
+       /* from 5.113 LDAPConnections in DRSR.pdf
+        * fschemaUpgradeInProgress: A Boolean that specifies certain constraint
+        * validations are skipped when adding, updating, or removing directory
+        * objects on the opened connection. The skipped constraint validations
+        * are documented in the applicable constraint sections in [MS-ADTS].
+        */
+       return ldb_module_done(req, NULL, NULL, ret);
+}
+
 static int rootdse_add(struct ldb_module *module, struct ldb_request *req)
 {
        struct ldb_context *ldb = ldb_module_get_ctx(module);
@@ -1378,6 +1408,9 @@ static int rootdse_modify(struct ldb_module *module, struct ldb_request *req)
        if (ldb_msg_find_element(req->op.mod.message, "enableOptionalFeature")) {
                return rootdse_enableoptionalfeature(module, req);
        }
+       if (ldb_msg_find_element(req->op.mod.message, "schemaUpgradeInProgress")) {
+               return rootdse_schemaupgradeinprogress(module, req);
+       }
 
        ldb_set_errstring(ldb, "rootdse_modify: unknown attribute to change!");
        return LDB_ERR_UNWILLING_TO_PERFORM;

diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index ae6042c6bd6c731c1b1945f9320c47d2705ac6c4..50f7bf7d13ae01b14d2d37b1e2f2955ee66fea3d 100644 (file)
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -167,6 +167,8 @@ struct dsdb_create_partition_exop {
  */
 #define DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID "1.3.6.1.4.1.7165.4.4.2"
 
+#define DSDB_EXTENDED_SCHEMA_UPGRADE_IN_PROGRESS_OID "1.3.6.1.4.1.7165.4.4.6"
+
 #define DSDB_OPENLDAP_DEREFERENCE_CONTROL "1.3.6.1.4.1.4203.666.5.16"
 
 struct dsdb_openldap_dereference {

diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 9ee4b26ae98861e0b8961491f8fdbbe87d4b66aa..c8e562317a9e2cc84361dd5425ce648306dd99bd 100644 (file)
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -1182,6 +1182,7 @@ static const struct ldap_control_handler ldap_known_controls[] = {
        { DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID, NULL, NULL },
        { DSDB_EXTENDED_ALLOCATE_RID_POOL, NULL, NULL },
        { DSDB_CONTROL_NO_GLOBAL_CATALOG, NULL, NULL },
+       { DSDB_EXTENDED_SCHEMA_UPGRADE_IN_PROGRESS_OID, NULL, NULL },
        { NULL, NULL, NULL }
 };
 

diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index 5f4a20a2f087024536f50b727b7a79f73bba6a1d..3d004c5ab17aa7ab6a1b1c3e434be04610730fa1 100644 (file)
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -202,6 +202,7 @@
 #Allocated: LDB_EXTENDED_SEQUENCE_NUMBER 1.3.6.1.4.1.7165.4.4.3
 #Allocated: DSDB_EXTENDED_CREATE_PARTITION_OID 1.3.6.1.4.1.7165.4.4.4
 #Allocated: DSDB_EXTENDED_ALLOCATE_RID_POOL 1.3.6.1.4.1.7165.4.4.5
+#Allocated: DSDB_EXTENDED_SCHEMA_UPGRADE_IN_PROGRESS_OID 1.3.6.1.4.1.7165.4.4.6
 
 
 ############