s4 upgradeprovision: add an option to force the rebuilding of FS ACLs on sysvols...

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 0fc60f1ce20466f3c4674b4985f55d6bc393c19a..f90443318a88f25fcbcd60356e091b2e9e23a633 100755 (executable)
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -141,6 +141,8 @@ parser.add_option("--debugchangesd", action="store_true",
                   help="Print information security descriptors differences")
 parser.add_option("--debugall", action="store_true",
                   help="Print all available information (very verbose)")
+parser.add_option("--resetfileacl", action="store_true",
+                  help="Force a reset on filesystem acls in sysvol / netlogon share")
 parser.add_option("--full", action="store_true",
                   help="Perform full upgrade of the samdb (schema, configuration, new objects, ...")
 
@@ -1495,7 +1497,10 @@ if __name__ == '__main__':
     # 22)
     if lastProvisionUSNs != None:
         updateProvisionUSN(ldbs.sam, minUSN, maxUSN)
-    update_gpo(paths, ldbs.sam, names, lp, message)
+    if opts.full or opts.resetfileacl:
+        update_gpo(paths, ldbs.sam, names, lp, message, 1)
+    else:
+        update_gpo(paths, ldbs.sam, names, lp, message, 0)
     ldbs.groupedCommit()
     new_ldbs.groupedCommit()
     message(SIMPLE, "Upgrade finished !")