s4: do not change the critical flag when it's on a dirsync control

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 7bc27b46b46a98f16ca98cbcdbbc12474bb822c6..c584a11b2c6e9f389003feaec9f2014e3216ad64 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -612,7 +612,11 @@ static int rootdse_filter_controls(struct ldb_module *module, struct ldb_request
                        continue;
                }
 
-               if (is_registered) {
+               /* If the control is DIRSYNC control then we keep the critical
+                * flag as the dirsync module will need to act upon it
+                */
+               if (is_registered && strcmp(req->controls[i]->oid,
+                                       LDB_CONTROL_DIRSYNC_OID)!= 0) {
                        req->controls[i]->critical = 0;
                }
        }