PEP8: fix E122: continuation line missing indentation or outdented

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index c64fd4c1159af15ef17fcfbab466edbfe686248b..77de06ad0eb480d56a8dd38edd0821221d1f909d 100644 (file)
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -741,7 +741,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
         if check_duplicates is True and self.has_duplicate_links(target_dn, forward_attr, forward_syntax):
             self.report("WARNING: Keep orphaned backlink attribute " + \
                         "'%s' in '%s' for link '%s' in '%s'" % (
-                        backlink_attr, obj_dn, forward_attr, target_dn))
+                            backlink_attr, obj_dn, forward_attr, target_dn))
             return
         self.report("ERROR: orphaned backlink attribute '%s' in %s for link %s in %s" % (backlink_attr, obj_dn, forward_attr, target_dn))
         if not self.confirm_all('Remove orphaned backlink %s' % backlink_attr, 'fix_all_orphaned_backlinks'):

diff --git a/python/samba/descriptor.py b/python/samba/descriptor.py
index 7a55e27cbddcbeedfa1f9d33191a51d939ac9328..7009cf67f525e638678f88e894e1dd204028fc33 100644 (file)
--- a/python/samba/descriptor.py
+++ b/python/samba/descriptor.py
@@ -69,314 +69,314 @@ def get_config_descriptor(domain_sid, name_map={}):
 
 def get_config_partitions_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;LCLORC;;;AU)" \
-    "(OA;;RP;e48d0154-bcf8-11d1-8702-00c04fb96050;;AU)" \
-    "(OA;;RP;d31a8757-2447-4545-8081-3bb610cacbf2;;AU)" \
-    "(OA;;RP;66171887-8f3c-11d0-afda-00c04fd930c9;;AU)" \
-    "(OA;;RP;032160bf-9824-11d1-aec0-0000f80367c1;;AU)" \
-    "(OA;;RP;789ee1eb-8c8e-4e4c-8cec-79b31b7617b5;;AU)" \
-    "(OA;;RP;5706aeaf-b940-4fb2-bcfc-5268683ad9fe;;AU)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;;CC;;;ED)" \
-    "(OA;CIIO;WP;3df793df-9858-4417-a701-735a1ecebf74;bf967a8d-0de6-11d0-a285-00aa003049e2;BA)" \
-    "S:" \
-    "(AU;CISA;WPCRCCDCWOWDSDDT;;;WD)"
+        "(A;;LCLORC;;;AU)" \
+        "(OA;;RP;e48d0154-bcf8-11d1-8702-00c04fb96050;;AU)" \
+        "(OA;;RP;d31a8757-2447-4545-8081-3bb610cacbf2;;AU)" \
+        "(OA;;RP;66171887-8f3c-11d0-afda-00c04fd930c9;;AU)" \
+        "(OA;;RP;032160bf-9824-11d1-aec0-0000f80367c1;;AU)" \
+        "(OA;;RP;789ee1eb-8c8e-4e4c-8cec-79b31b7617b5;;AU)" \
+        "(OA;;RP;5706aeaf-b940-4fb2-bcfc-5268683ad9fe;;AU)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;;CC;;;ED)" \
+        "(OA;CIIO;WP;3df793df-9858-4417-a701-735a1ecebf74;bf967a8d-0de6-11d0-a285-00aa003049e2;BA)" \
+        "S:" \
+        "(AU;CISA;WPCRCCDCWOWDSDDT;;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_config_sites_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(OA;CIIO;SW;d31a8757-2447-4545-8081-3bb610cacbf2;f0f8ffab-1191-11d0-a060-00aa006c33ed;ER)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "S:" \
-    "(AU;CISA;CCDCSDDT;;;WD)" \
-    "(OU;CIIOSA;CR;;f0f8ffab-1191-11d0-a060-00aa006c33ed;WD)" \
-    "(OU;CIIOSA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967ab3-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(OU;CIIOSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967ab3-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(OU;CIIOSA;WP;3e10944c-c354-11d0-aff8-0000f80367c1;b7b13124-b82e-11d0-afee-0000f80367c1;WD)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(OA;CIIO;SW;d31a8757-2447-4545-8081-3bb610cacbf2;f0f8ffab-1191-11d0-a060-00aa006c33ed;ER)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "S:" \
+        "(AU;CISA;CCDCSDDT;;;WD)" \
+        "(OU;CIIOSA;CR;;f0f8ffab-1191-11d0-a060-00aa006c33ed;WD)" \
+        "(OU;CIIOSA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967ab3-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(OU;CIIOSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967ab3-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(OU;CIIOSA;WP;3e10944c-c354-11d0-aff8-0000f80367c1;b7b13124-b82e-11d0-afee-0000f80367c1;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_config_ntds_quotas_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
-    "(A;;RPLCLORC;;;BA)" \
-    "(OA;;CR;4ecc03fe-ffc0-4947-b630-eb672a8a9dbc;;WD)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
+        "(A;;RPLCLORC;;;BA)" \
+        "(OA;;CR;4ecc03fe-ffc0-4947-b630-eb672a8a9dbc;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_config_delete_protected1_descriptor(domain_sid, name_map={}):
     sddl = "D:AI" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_config_delete_protected1wd_descriptor(domain_sid, name_map={}):
     sddl = "D:AI" \
-    "(A;;RPLCLORC;;;WD)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;WD)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_config_delete_protected2_descriptor(domain_sid, name_map={}):
     sddl = "D:AI" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSW;;;EA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSW;;;EA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_descriptor(domain_sid, name_map={}):
     sddl= "O:BAG:BAD:AI(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
         "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ER)" \
-    "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;DD)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;BA)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;IF)" \
-    "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)" \
-    "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)" \
-    "(OA;CIIO;RPLCLORC;;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)" \
-    "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;ED)" \
-    "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)" \
-    "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)" \
-    "(OA;CIIO;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
-    "(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
-    "(A;;RPRC;;;RU)" \
-    "(A;CI;LC;;;RU)" \
-    "(A;CI;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
-    "(A;;RP;;;WD)" \
-    "(A;;RPLCLORC;;;ED)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "S:AI(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(AU;SA;CR;;;DU)(AU;SA;CR;;;BA)(AU;SA;WPWOWD;;;WD)"
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ER)" \
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;DD)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;BA)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;IF)" \
+        "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)" \
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)" \
+        "(OA;CIIO;RPLCLORC;;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)" \
+        "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;ED)" \
+        "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)" \
+        "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)" \
+        "(OA;CIIO;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
+        "(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
+        "(A;;RPRC;;;RU)" \
+        "(A;CI;LC;;;RU)" \
+        "(A;CI;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
+        "(A;;RP;;;WD)" \
+        "(A;;RPLCLORC;;;ED)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "S:AI(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(AU;SA;CR;;;DU)(AU;SA;CR;;;BA)(AU;SA;WPWOWD;;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_infrastructure_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "S:" \
-    "(AU;SA;WPCR;;;WD)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "S:" \
+        "(AU;SA;WPCR;;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_builtin_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ER)" \
-    "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;DD)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;BA)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;IF)" \
-    "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)" \
-    "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)" \
-    "(OA;CIIO;RPLCLORC;;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)" \
-    "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;ED)" \
-    "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)" \
-    "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)" \
-    "(OA;CIIO;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
-    "(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
-    "(A;;RPRC;;;RU)" \
-    "(A;CI;LC;;;RU)" \
-    "(A;CI;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
-    "(A;;RP;;;WD)" \
-    "(A;;RPLCLORC;;;ED)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "S:" \
-    "(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(AU;SA;CR;;;DU)" \
-    "(AU;SA;CR;;;BA)" \
-    "(AU;SA;WPWOWD;;;WD)"
+        "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ER)" \
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;DD)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;BA)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;IF)" \
+        "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)" \
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)" \
+        "(OA;CIIO;RPLCLORC;;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)" \
+        "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;ED)" \
+        "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)" \
+        "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)" \
+        "(OA;CIIO;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
+        "(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
+        "(A;;RPRC;;;RU)" \
+        "(A;CI;LC;;;RU)" \
+        "(A;CI;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
+        "(A;;RP;;;WD)" \
+        "(A;;RPLCLORC;;;ED)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "S:" \
+        "(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(AU;SA;CR;;;DU)" \
+        "(AU;SA;CR;;;BA)" \
+        "(AU;SA;WPWOWD;;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_computers_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
-    "(OA;;CCDC;bf967a86-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(OA;;CCDC;4828cc14-1437-45bc-9b07-ad6f015e5f28;;AO)" \
-    "S:"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
+        "(OA;;CCDC;bf967a86-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "(OA;;CCDC;4828cc14-1437-45bc-9b07-ad6f015e5f28;;AO)" \
+        "S:"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_users_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
-    "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(OA;;CCDC;4828cc14-1437-45bc-9b07-ad6f015e5f28;;AO)" \
-    "S:"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
+        "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(OA;;CCDC;bf967aa8-0de6-11d0-a285-00aa003049e2;;PO)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "(OA;;CCDC;4828cc14-1437-45bc-9b07-ad6f015e5f28;;AO)" \
+        "S:"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_managed_service_accounts_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
-    "(OA;;CCDC;ce206244-5827-4a86-ba1c-1c0c386c1b64;;AO)" \
-    "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "S:"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
+        "(OA;;CCDC;ce206244-5827-4a86-ba1c-1c0c386c1b64;;AO)" \
+        "(OA;;CCDC;bf967aba-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(OA;;CCDC;bf967a9c-0de6-11d0-a285-00aa003049e2;;AO)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "S:"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_controllers_descriptor(domain_sid, name_map={}):
     sddl = "D:" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;;RPLCLORC;;;ED)" \
-    "S:" \
-    "(AU;SA;CCDCWOWDSDDT;;;WD)" \
-    "(AU;CISA;WP;;;WD)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;;RPLCLORC;;;ED)" \
+        "S:" \
+        "(AU;SA;CCDCWOWDSDDT;;;WD)" \
+        "(AU;CISA;WP;;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_delete_protected1_descriptor(domain_sid, name_map={}):
     sddl = "D:AI" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_domain_delete_protected2_descriptor(domain_sid, name_map={}):
     sddl = "D:AI" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSW;;;DA)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_dns_partition_descriptor(domain_sid, name_map={}):
     sddl = "O:SYG:BAD:AI" \
-    "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ER)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)" \
-    "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;BA)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
-    "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;IF)" \
-    "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)" \
-    "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)" \
-    "(OA;CIIO;RPLCLORC;;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
-    "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
-    "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)" \
-    "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;ED)" \
-    "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)" \
-    "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)" \
-    "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
-    "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)" \
-    "(OA;CIIO;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
-    "(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
-    "(A;;RPRC;;;RU)" \
-    "(A;CI;LC;;;RU)" \
-    "(A;CI;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
-    "(A;;RP;;;WD)" \
-    "(A;;RPLCLORC;;;ED)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "S:AI" \
-    "(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
-    "(AU;SA;CR;;;DU)(AU;SA;CR;;;BA)(AU;SA;WPWOWD;;;WD)"
+        "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;4c164200-20c0-11d0-a768-00aa006e0529;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;bc0ac240-79a9-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;59ba2f42-79a2-11d0-9020-00c04fc2d3cf;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RP;037088f8-0ae1-11d2-b422-00a0c968f939;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ER)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a9c-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;CIIO;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967aba-0de6-11d0-a285-00aa003049e2;ED)" \
+        "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;BA)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;BA)" \
+        "(OA;;CR;e2a36dc9-ae17-47c3-b58b-be34c55ba633;;IF)" \
+        "(OA;;RP;c7407360-20bf-11d0-a768-00aa006e0529;;RU)" \
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;RU)" \
+        "(OA;CIIO;RPLCLORC;;4828cc14-1437-45bc-9b07-ad6f015e5f28;RU)" \
+        "(OA;CIIO;RPLCLORC;;bf967a9c-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;CIIO;RPLCLORC;;bf967aba-0de6-11d0-a285-00aa003049e2;RU)" \
+        "(OA;;CR;05c74c5e-4deb-43b4-bd9f-86664c2a7fd5;;AU)" \
+        "(OA;;CR;89e95b76-444d-4c62-991a-0facbeda640c;;ED)" \
+        "(OA;;CR;ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501;;AU)" \
+        "(OA;;CR;280f369c-67c7-438e-ae98-1d46f3c6f541;;AU)" \
+        "(OA;;CR;1131f6aa-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ab-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ac-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ad-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;CR;1131f6ae-9c07-11d1-f79f-00c04fc2dcd2;;ED)" \
+        "(OA;;RP;b8119fd0-04f6-4762-ab7a-4986c76b3f9a;;AU)" \
+        "(OA;CIIO;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;DA)" \
+        "(A;CI;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
+        "(A;;RPRC;;;RU)" \
+        "(A;CI;LC;;;RU)" \
+        "(A;CI;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
+        "(A;;RP;;;WD)" \
+        "(A;;RPLCLORC;;;ED)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "S:AI" \
+        "(OU;CISA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(OU;CISA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)" \
+        "(AU;SA;CR;;;DU)(AU;SA;CR;;;BA)(AU;SA;WPWOWD;;;WD)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_dns_forest_microsoft_dns_descriptor(domain_sid, name_map={}):
     sddl = "O:SYG:SYD:AI" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_dns_domain_microsoft_dns_descriptor(domain_sid, name_map={}):
     sddl = "O:SYG:SYD:AI" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)" \
-    "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;DnsAdmins)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)"
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)" \
+        "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;DnsAdmins)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_paritions_crossref_subdomain_descriptor(domain_sid, name_map={}):
     sddl = "O:SubdomainAdminsG:SubdomainAdminsD:AI" \
-    "(A;;RPWPCRCCLCLORCWOWDSW;;;SubdomainAdmins)" \
-    "(A;;RPLCLORC;;;AU)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
+        "(A;;RPWPCRCCLCLORCWOWDSW;;;SubdomainAdmins)" \
+        "(A;;RPLCLORC;;;AU)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)"
     return sddl2binary(sddl, domain_sid, name_map)
 
 def get_wellknown_sds(samdb):

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 25d1d4a67b034238225268c754693035a65760c9..c8aa92b3ee0a155fae157bb00126937ede2f8290 100644 (file)
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -2465,7 +2465,7 @@ class cmd_domain_trust_create(DomainTrustCommand):
             if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
                 raise self.LocalRuntimeError(self, error,
                                 "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
-                                lsaString.string))
+                                    lsaString.string))
 
         try:
             lsaString.string = local_trust_info.netbios_name.string
@@ -2476,7 +2476,7 @@ class cmd_domain_trust_create(DomainTrustCommand):
             if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
                 raise self.LocalRuntimeError(self, error,
                                 "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
-                                lsaString.string))
+                                    lsaString.string))
 
         if remote_trust_info:
             try:
@@ -2488,7 +2488,7 @@ class cmd_domain_trust_create(DomainTrustCommand):
                 if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
                     raise self.RemoteRuntimeError(self, error,
                                     "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
-                                    lsaString.string))
+                                        lsaString.string))
 
             try:
                 lsaString.string = remote_trust_info.netbios_name.string
@@ -2499,7 +2499,7 @@ class cmd_domain_trust_create(DomainTrustCommand):
                 if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
                     raise self.RemoteRuntimeError(self, error,
                                     "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
-                                    lsaString.string))
+                                        lsaString.string))
 
         try:
             local_netlogon = self.new_local_netlogon_connection()

diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index 2d302fa1e243adc346477fb64aebb7937ecce0b5..800a16ad1b367f6d1437637cb806b32ef581fe4f 100644 (file)
--- a/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
@@ -578,7 +578,7 @@ class LDAPObject(object):
             title = 4*" " + "Attributes found only in %s:" % self.con.host
             for x in self.attributes.keys():
                 if not x in other.attributes.keys() and \
-                not x.upper() in [q.upper() for q in other.ignore_attributes]:
+                    not x.upper() in [q.upper() for q in other.ignore_attributes]:
                     if title:
                         res += title + "\n"
                         title = None
@@ -588,7 +588,7 @@ class LDAPObject(object):
             title = 4*" " + "Attributes found only in %s:" % other.con.host
             for x in other.attributes.keys():
                 if not x in self.attributes.keys() and \
-                not x.upper() in [q.upper() for q in self.ignore_attributes]:
+                    not x.upper() in [q.upper() for q in self.ignore_attributes]:
                     if title:
                         res += title + "\n"
                         title = None

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 9daa65142663fc6978dd75ca7d1219d918d5b6e3..ca19b885d53267ec068a1c6415c3b24227e1e6b3 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1477,8 +1477,8 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
         logger.info("Modifying display specifiers and extended rights")
         setup_modify_ldif(samdb,
             setup_path("provision_configuration_modify.ldif"), {
-            "CONFIGDN": names.configdn,
-            "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr
+                "CONFIGDN": names.configdn,
+                "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr
             })
 
     logger.info("Adding users container")
@@ -1527,8 +1527,8 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
         managedservice_descr = b64encode(get_managed_service_accounts_descriptor(names.domainsid)).decode('utf8')
         setup_modify_ldif(samdb,
                           setup_path("provision_configuration_references.ldif"), {
-                "CONFIGDN": names.configdn,
-                "SCHEMADN": names.schemadn})
+                              "CONFIGDN": names.configdn,
+                              "SCHEMADN": names.schemadn})
 
         logger.info("Setting up well known security principals")
         protected1wd_descr = b64encode(get_config_delete_protected1wd_descriptor(names.domainsid)).decode('utf8')
@@ -2039,9 +2039,9 @@ def provision_fake_ypserver(logger, samdb, domaindn, netbiosname, nisdomain,
     try:
         logger.info("Setting up fake yp server settings")
         setup_add_ldif(samdb, setup_path("ypServ30.ldif"), {
-        "DOMAINDN": domaindn,
-        "NETBIOSNAME": netbiosname,
-        "NISDOMAIN": nisdomain,
+            "DOMAINDN": domaindn,
+            "NETBIOSNAME": netbiosname,
+            "NISDOMAIN": nisdomain,
             })
     except:
         samdb.transaction_cancel()

diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index af829873539c5ebf376f457f83b6542e6c09e17e..ea73f964b76d372ab1a3fa7451861b2a082243ae 100644 (file)
--- a/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
@@ -339,7 +339,7 @@ class OpenLDAPBackend(LDAPBackend):
 
         self.schema = Schema(self.domainsid,
                              schemadn=self.names.schemadn, files=[
-                setup_path("schema_samba4.ldif")])
+                                 setup_path("schema_samba4.ldif")])
 
     def setup_db_dir(self, dbdir):
         """Create a database directory.

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 17f7640526936186cb7f4a3e8fd9a8fad1b8492c..740eac2a7a0705e9be179ef2cef57c867688173e 100644 (file)
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -469,18 +469,18 @@ def add_host_record(samdb, container_dn, prefix, hostip, hostip6):
 def add_domain_record(samdb, domaindn, prefix, dnsdomain, domainsid, dnsadmins_sid):
     # DC=<DNSDOMAIN>,CN=MicrosoftDNS,<PREFIX>,<DOMAINDN>
     sddl = "O:SYG:BAD:AI" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)" \
-    "(A;;CC;;;AU)" \
-    "(A;;RPLCLORC;;;WD)" \
-    "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-    "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \
-    "(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;%s)" \
-    "(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \
-    "(OA;CIID;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
-    "(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
-    "(A;CIID;LC;;;RU)" \
-    "(A;CIID;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
-    "S:AI" % dnsadmins_sid
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)" \
+        "(A;;CC;;;AU)" \
+        "(A;;RPLCLORC;;;WD)" \
+        "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
+        "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \
+        "(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;%s)" \
+        "(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \
+        "(OA;CIID;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
+        "(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
+        "(A;CIID;LC;;;RU)" \
+        "(A;CIID;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
+        "S:AI" % dnsadmins_sid
     sec = security.descriptor.from_sddl(sddl, domainsid)
     props = []
     props.append(ndr_pack(TypeProperty()))

diff --git a/python/samba/tests/graph.py b/python/samba/tests/graph.py
index 7ea53caa7343a9fe24b9d93913af28b2fc85f5de..efbe75955a4fcdc8443ab81a5839e6e298c0df30 100644 (file)
--- a/python/samba/tests/graph.py
+++ b/python/samba/tests/graph.py
@@ -183,7 +183,7 @@ elephant 2311·-
 \e[38;5;39melephant\e[0m \e[38;5;214m2\e[0m\e[38;5;208m3\e[0m\e[38;5;112m1\e[0m\e[38;5;112m1\e[0m\e[0m\e[38;5;39m·\e[0m\e[48;5;124m-\e[0m
 \e[38;5;45m    frog\e[0m \e[38;5;214m2\e[0m\e[38;5;208m3\e[0m\e[38;5;112m1\e[0m\e[38;5;214m2\e[0m\e[38;5;112m1\e[0m\e[0m\e[38;5;45m·\e[0m\e[0m
                 ''',
-'utf8 True, colour xterm-256color-heatmap': '''
+            'utf8 True, colour xterm-256color-heatmap': '''
                  \e[4mdestination\e[0m
          \e[0m\e[38;5;171m╭────── ant\e[0m
          \e[38;5;171m│\e[0m\e[38;5;207m╭───── bat\e[0m
@@ -198,7 +198,7 @@ elephant 2311·-
 \e[38;5;171melephant\e[0m \e[48;5;214m2\e[0m\e[48;5;208m3\e[0m\e[48;5;112m1\e[0m\e[48;5;112m1\e[0m\e[0m\e[38;5;171m·\e[0m\e[48;5;124m-\e[0m
 \e[38;5;207m    frog\e[0m \e[48;5;214m2\e[0m\e[48;5;208m3\e[0m\e[48;5;112m1\e[0m\e[48;5;214m2\e[0m\e[48;5;112m1\e[0m\e[0m\e[38;5;207m·\e[0m\e[0m
 ''',
-'utf8 False, colour None': '''
+            'utf8 False, colour None': '''
                  destination
          ,------ ant
          |,----- bat
@@ -213,7 +213,7 @@ elephant 2311·-
 elephant 23110-
     frog 231210
 ''',
-'utf8 False, colour ansi': '''
+            'utf8 False, colour ansi': '''
                  \e[4mdestination\e[0m
          \e[0m\e[37m,------ ant\e[0m
          \e[37m|\e[0m\e[1;30m,----- bat\e[0m
@@ -228,7 +228,7 @@ elephant 23110-
 \e[37melephant\e[0m \e[33m2\e[0m\e[33m3\e[0m\e[1;32m1\e[0m\e[1;32m1\e[0m\e[0m\e[37m0\e[0m\e[1;31m-\e[0m
 \e[1;30m    frog\e[0m \e[33m2\e[0m\e[33m3\e[0m\e[1;32m1\e[0m\e[33m2\e[0m\e[1;32m1\e[0m\e[0m\e[1;30m0\e[0m\e[0m
 ''',
-'utf8 False, colour ansi-heatmap': '''
+            'utf8 False, colour ansi-heatmap': '''
                  \e[4mdestination\e[0m
          \e[0m\e[37m,------ ant\e[0m
          \e[37m|\e[0m\e[1;30m,----- bat\e[0m
@@ -243,7 +243,7 @@ elephant 23110-
 \e[37melephant\e[0m \e[43m2\e[0m\e[43m3\e[0m\e[1;42m1\e[0m\e[1;42m1\e[0m\e[0m\e[37m0\e[0m\e[1;41m-\e[0m
 \e[1;30m    frog\e[0m \e[43m2\e[0m\e[43m3\e[0m\e[1;42m1\e[0m\e[43m2\e[0m\e[1;42m1\e[0m\e[0m\e[1;30m0\e[0m\e[0m
 ''',
-'utf8 False, colour xterm-256color': '''
+            'utf8 False, colour xterm-256color': '''
                  \e[4mdestination\e[0m
          \e[0m\e[38;5;39m,------ ant\e[0m
          \e[38;5;39m|\e[0m\e[38;5;45m,----- bat\e[0m
@@ -258,7 +258,7 @@ elephant 23110-
 \e[38;5;39melephant\e[0m \e[38;5;214m2\e[0m\e[38;5;208m3\e[0m\e[38;5;112m1\e[0m\e[38;5;112m1\e[0m\e[0m\e[38;5;39m0\e[0m\e[48;5;124m-\e[0m
 \e[38;5;45m    frog\e[0m \e[38;5;214m2\e[0m\e[38;5;208m3\e[0m\e[38;5;112m1\e[0m\e[38;5;214m2\e[0m\e[38;5;112m1\e[0m\e[0m\e[38;5;45m0\e[0m\e[0m
 ''',
-'utf8 False, colour xterm-256color-heatmap': '''
+            'utf8 False, colour xterm-256color-heatmap': '''
                  \e[4mdestination\e[0m
          \e[0m\e[38;5;171m,------ ant\e[0m
          \e[38;5;171m|\e[0m\e[38;5;207m,----- bat\e[0m
@@ -306,7 +306,7 @@ source ││╭─ cat
 \e[1;30m   bat\e[0m \e[1;32m1\e[0m\e[0m\e[1;30m·\e[0m\e[33m2\e[0m\e[0m
 \e[37m   cat\e[0m \e[33m2\e[0m\e[1;32m1\e[0m\e[0m\e[37m·\e[0m\e[0m
             ''',
-'utf8 True, colour ansi-heatmap': '''
+            'utf8 True, colour ansi-heatmap': '''
             \e[4mdestination\e[0m
        \e[0m\e[37m╭─── ant\e[0m
        \e[37m│\e[0m\e[1;30m╭── bat\e[0m
@@ -315,7 +315,7 @@ source ││╭─ cat
 \e[1;30m   bat\e[0m \e[1;42m1\e[0m\e[0m\e[1;30m·\e[0m\e[43m2\e[0m\e[0m
 \e[37m   cat\e[0m \e[43m2\e[0m\e[1;42m1\e[0m\e[0m\e[37m·\e[0m\e[0m
         ''',
-'utf8 True, colour xterm-256color': '''
+            'utf8 True, colour xterm-256color': '''
             \e[4mdestination\e[0m
        \e[0m\e[38;5;39m╭─── ant\e[0m
        \e[38;5;39m│\e[0m\e[38;5;45m╭── bat\e[0m
@@ -324,7 +324,7 @@ source ││╭─ cat
 \e[38;5;45m   bat\e[0m \e[38;5;112m1\e[0m\e[0m\e[38;5;45m·\e[0m\e[38;5;208m2\e[0m\e[0m
 \e[38;5;39m   cat\e[0m \e[38;5;208m2\e[0m\e[38;5;112m1\e[0m\e[0m\e[38;5;39m·\e[0m\e[0m
 ''',
-'utf8 True, colour xterm-256color-heatmap': '''
+            'utf8 True, colour xterm-256color-heatmap': '''
             \e[4mdestination\e[0m
        \e[0m\e[38;5;171m╭─── ant\e[0m
        \e[38;5;171m│\e[0m\e[38;5;207m╭── bat\e[0m
@@ -333,7 +333,7 @@ source ││╭─ cat
 \e[38;5;207m   bat\e[0m \e[48;5;112m1\e[0m\e[0m\e[38;5;207m·\e[0m\e[48;5;208m2\e[0m\e[0m
 \e[38;5;171m   cat\e[0m \e[48;5;208m2\e[0m\e[48;5;112m1\e[0m\e[0m\e[38;5;171m·\e[0m\e[0m
 ''',
-'utf8 False, colour None': '''
+            'utf8 False, colour None': '''
             destination
        ,--- ant
        |,-- bat
@@ -342,7 +342,7 @@ source ||,- cat
    bat 102
    cat 210
 ''',
-'utf8 False, colour ansi': '''
+            'utf8 False, colour ansi': '''
             \e[4mdestination\e[0m
        \e[0m\e[37m,--- ant\e[0m
        \e[37m|\e[0m\e[1;30m,-- bat\e[0m
@@ -351,7 +351,7 @@ source ||,- cat
 \e[1;30m   bat\e[0m \e[1;32m1\e[0m\e[0m\e[1;30m0\e[0m\e[33m2\e[0m\e[0m
 \e[37m   cat\e[0m \e[33m2\e[0m\e[1;32m1\e[0m\e[0m\e[37m0\e[0m\e[0m
 ''',
-'utf8 False, colour ansi-heatmap': '''
+            'utf8 False, colour ansi-heatmap': '''
             \e[4mdestination\e[0m
        \e[0m\e[37m,--- ant\e[0m
        \e[37m|\e[0m\e[1;30m,-- bat\e[0m
@@ -360,7 +360,7 @@ source ||,- cat
 \e[1;30m   bat\e[0m \e[1;42m1\e[0m\e[0m\e[1;30m0\e[0m\e[43m2\e[0m\e[0m
 \e[37m   cat\e[0m \e[43m2\e[0m\e[1;42m1\e[0m\e[0m\e[37m0\e[0m\e[0m
 ''',
-'utf8 False, colour xterm-256color': '''
+            'utf8 False, colour xterm-256color': '''
             \e[4mdestination\e[0m
        \e[0m\e[38;5;39m,--- ant\e[0m
        \e[38;5;39m|\e[0m\e[38;5;45m,-- bat\e[0m
@@ -369,7 +369,7 @@ source ||,- cat
 \e[38;5;45m   bat\e[0m \e[38;5;112m1\e[0m\e[0m\e[38;5;45m0\e[0m\e[38;5;208m2\e[0m\e[0m
 \e[38;5;39m   cat\e[0m \e[38;5;208m2\e[0m\e[38;5;112m1\e[0m\e[0m\e[38;5;39m0\e[0m\e[0m
 ''',
-'utf8 False, colour xterm-256color-heatmap': '''
+            'utf8 False, colour xterm-256color-heatmap': '''
             \e[4mdestination\e[0m
        \e[0m\e[38;5;171m,--- ant\e[0m
        \e[38;5;171m|\e[0m\e[38;5;207m,-- bat\e[0m
@@ -394,7 +394,7 @@ source ||,- cat
                  ('dog', 'ant'),
                  ('dog', 'eel')]
         expected = {
-'utf8 True, colour None': '''
+            'utf8 True, colour None': '''
               destination
        ╭───── ant
        │╭──── bat
@@ -407,7 +407,7 @@ source ││││╭─ eel
    dog 123·1
    eel ----·
 ''',
-'utf8 True, colour ansi': '''
+            'utf8 True, colour ansi': '''
               \e[4mdestination\e[0m
        \e[0m\e[37m╭───── ant\e[0m
        \e[37m│\e[0m\e[1;30m╭──── bat\e[0m
@@ -420,7 +420,7 @@ source ││││╭─ eel
 \e[1;30m   dog\e[0m \e[1;32m1\e[0m\e[33m2\e[0m\e[33m3\e[0m\e[0m\e[1;30m·\e[0m\e[1;32m1\e[0m\e[0m
 \e[37m   eel\e[0m \e[1;31m-\e[1;31m-\e[1;31m-\e[1;31m-\e[0m\e[37m·\e[0m\e[0m
 ''',
-'utf8 True, colour ansi-heatmap': '''
+            'utf8 True, colour ansi-heatmap': '''
               \e[4mdestination\e[0m
        \e[0m\e[37m╭───── ant\e[0m
        \e[37m│\e[0m\e[1;30m╭──── bat\e[0m
@@ -433,7 +433,7 @@ source ││││╭─ eel
 \e[1;30m   dog\e[0m \e[1;42m1\e[0m\e[43m2\e[0m\e[43m3\e[0m\e[0m\e[1;30m·\e[0m\e[1;42m1\e[0m\e[0m
 \e[37m   eel\e[0m \e[1;41m-\e[1;41m-\e[1;41m-\e[1;41m-\e[0m\e[37m·\e[0m\e[0m
 ''',
-'utf8 True, colour xterm-256color': '''
+            'utf8 True, colour xterm-256color': '''
               \e[4mdestination\e[0m
        \e[0m\e[38;5;39m╭───── ant\e[0m
        \e[38;5;39m│\e[0m\e[38;5;45m╭──── bat\e[0m
@@ -446,7 +446,7 @@ source ││││╭─ eel
 \e[38;5;45m   dog\e[0m \e[38;5;112m1\e[0m\e[38;5;214m2\e[0m\e[38;5;208m3\e[0m\e[0m\e[38;5;45m·\e[0m\e[38;5;112m1\e[0m\e[0m
 \e[38;5;39m   eel\e[0m \e[48;5;124m-\e[48;5;124m-\e[48;5;124m-\e[48;5;124m-\e[0m\e[38;5;39m·\e[0m\e[0m
 ''',
-'utf8 True, colour xterm-256color-heatmap': '''
+            'utf8 True, colour xterm-256color-heatmap': '''
               \e[4mdestination\e[0m
        \e[0m\e[38;5;171m╭───── ant\e[0m
        \e[38;5;171m│\e[0m\e[38;5;207m╭──── bat\e[0m
@@ -459,7 +459,7 @@ source ││││╭─ eel
 \e[38;5;207m   dog\e[0m \e[48;5;112m1\e[0m\e[48;5;214m2\e[0m\e[48;5;208m3\e[0m\e[0m\e[38;5;207m·\e[0m\e[48;5;112m1\e[0m\e[0m
 \e[38;5;171m   eel\e[0m \e[48;5;124m-\e[48;5;124m-\e[48;5;124m-\e[48;5;124m-\e[0m\e[38;5;171m·\e[0m\e[0m
 ''',
-'utf8 False, colour None': '''
+            'utf8 False, colour None': '''
               destination
        ,----- ant
        |,---- bat
@@ -472,7 +472,7 @@ source ||||,- eel
    dog 12301
    eel ----0
 ''',
-'utf8 False, colour ansi': '''
+            'utf8 False, colour ansi': '''
               \e[4mdestination\e[0m
        \e[0m\e[37m,----- ant\e[0m
        \e[37m|\e[0m\e[1;30m,---- bat\e[0m
@@ -485,7 +485,7 @@ source ||||,- eel
 \e[1;30m   dog\e[0m \e[1;32m1\e[0m\e[33m2\e[0m\e[33m3\e[0m\e[0m\e[1;30m0\e[0m\e[1;32m1\e[0m\e[0m
 \e[37m   eel\e[0m \e[1;31m-\e[1;31m-\e[1;31m-\e[1;31m-\e[0m\e[37m0\e[0m\e[0m
 ''',
-'utf8 False, colour ansi-heatmap': '''
+            'utf8 False, colour ansi-heatmap': '''
               \e[4mdestination\e[0m
        \e[0m\e[37m,----- ant\e[0m
        \e[37m|\e[0m\e[1;30m,---- bat\e[0m
@@ -498,8 +498,8 @@ source ||||,- eel
 \e[1;30m   dog\e[0m \e[1;42m1\e[0m\e[43m2\e[0m\e[43m3\e[0m\e[0m\e[1;30m0\e[0m\e[1;42m1\e[0m\e[0m
 \e[37m   eel\e[0m \e[1;41m-\e[1;41m-\e[1;41m-\e[1;41m-\e[0m\e[37m0\e[0m\e[0m
 ''',
-'utf8 False, colour xterm-256color':
-'''              \e[4mdestination\e[0m
+            'utf8 False, colour xterm-256color':
+            '''              \e[4mdestination\e[0m
        \e[0m\e[38;5;39m,----- ant\e[0m
        \e[38;5;39m|\e[0m\e[38;5;45m,---- bat\e[0m
        \e[38;5;39m|\e[38;5;45m|\e[0m\e[38;5;39m,--- cat\e[0m
@@ -511,7 +511,7 @@ source ||||,- eel
 \e[38;5;45m   dog\e[0m \e[38;5;112m1\e[0m\e[38;5;214m2\e[0m\e[38;5;208m3\e[0m\e[0m\e[38;5;45m0\e[0m\e[38;5;112m1\e[0m\e[0m
 \e[38;5;39m   eel\e[0m \e[48;5;124m-\e[48;5;124m-\e[48;5;124m-\e[48;5;124m-\e[0m\e[38;5;39m0\e[0m\e[0m
 ''',
-'utf8 False, colour xterm-256color-heatmap': '''
+            'utf8 False, colour xterm-256color-heatmap': '''
               \e[4mdestination\e[0m
        \e[0m\e[38;5;171m,----- ant\e[0m
        \e[38;5;171m|\e[0m\e[38;5;207m,---- bat\e[0m

diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py
index f99288a7cb88bf80421b8a8f996585a2355442df..9b9b96a08eade4bcad7fb52c5094fc24efb91608 100644 (file)
--- a/python/samba/tests/samba_tool/user.py
+++ b/python/samba/tests/samba_tool/user.py
@@ -381,7 +381,7 @@ company: %s
 sAMAccountName: %s
 
 """ % (user["given-name"], user["surname"], self.samdb.domain_dn(),
-       user["company"], user["name"])
+                user["company"], user["name"])
 
             self.assertEqual(out, expected_out,
                              "Unexpected show output for user '%s'" %

diff --git a/script/autobuild.py b/script/autobuild.py
index 5e78aa1543405264930bbeef4d005c39e0cdd54c..752d04f2225bffadbd87209d9b32087e72b85a39 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -490,7 +490,7 @@ class buildlist(object):
                                rebase_remote, rebase_branch,
                                rebase_remote,
                                rebase_remote, rebase_branch
-                           ),
+                                ),
                            "test/plain" ) ]
 
             self.retry = builder('retry', retry_task, cp=False)

diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py
index 9ce0d4c32bfdab7c39dec3531a94db5b05b94ec5..c5a42c60f61c388a75efa79a3ab00c7b551f896f 100644 (file)
--- a/source4/dsdb/tests/python/ndr_pack_performance.py
+++ b/source4/dsdb/tests/python/ndr_pack_performance.py
@@ -65,7 +65,7 @@ random.seed(1)
 
 
 BIG_SD_SDDL = ''.join(
-"""O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
+    """O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
 1-3328325300-3937145445-4190589019-512D:AI(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;S-
 1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;
 SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O
@@ -118,7 +118,7 @@ f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)
 80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)""".split())
 
 LITTLE_SD_SDDL = ''.join(
-"""O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
+    """O:S-1-5-21-3328325300-3937145445-4190589019-512G:S-1-5-2
 1-3328325300-3937145445-4190589019-512D:AI(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;S-
 1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;
 SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O

diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index 91a794833670ec004ac8297e3d2db3df6a3336b2..e2d7b40ebaed902adc1b0600c61a36036f92adc1 100755 (executable)
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -1797,7 +1797,7 @@ class SamTests(samba.tests.TestCase):
         def assertLDAPErrorMsg(msg, expected_msg):
             self.assertTrue(expected_msg in msg,
                             "msg[%s] does not contain expected[%s]" % (
-                            msg, expected_msg))
+                                msg, expected_msg))
 
         try:
             ldb_fail = SamDB(url=host, credentials=sasl_wrong_creds, lp=lp)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index a41149e31fff64fdefcb7ac1f5f14c9eec95bcc7..9645416e9418660d3183b16f552f8b804adc46a4 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -280,15 +280,15 @@ for bindoptions in ["sign", "seal"]:
 for transport in transports:
     for bindoptions in ["sign", "seal"]:
         for ntlmoptions in [
-        "--option=ntlmssp_client:ntlm2=yes --option=torture:quick=yes",
-        "--option=ntlmssp_client:ntlm2=no --option=torture:quick=yes",
-        "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
-        "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
-        "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
-        "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
-        "--option=clientntlmv2auth=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
-        "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes --option=torture:quick=yes",
-        "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]:
+            "--option=ntlmssp_client:ntlm2=yes --option=torture:quick=yes",
+            "--option=ntlmssp_client:ntlm2=no --option=torture:quick=yes",
+            "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
+            "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:128bit=no --option=torture:quick=yes",
+            "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
+            "--option=ntlmssp_client:ntlm2=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
+            "--option=clientntlmv2auth=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes",
+            "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes --option=torture:quick=yes",
+            "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]:
             if transport == "ncalrpc":
                 env = "ad_dc_ntvfs:local"
             else:

diff --git a/source4/torture/drs/python/getnc_exop.py b/source4/torture/drs/python/getnc_exop.py
index 366071c3497651ada306f9503b5db0bdaa56651b..db71748c4c8a8f2f08f3de1c036e419b4e356acf 100644 (file)
--- a/source4/torture/drs/python/getnc_exop.py
+++ b/source4/torture/drs/python/getnc_exop.py
@@ -1020,19 +1020,19 @@ class DrsReplicaSyncSortTestCase(drs_base.DrsBaseTestCase):
                      drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
                      g_guid,
                      u1_guid),
-        AbstractLink(drsuapi.DRSUAPI_ATTID_member,
+            AbstractLink(drsuapi.DRSUAPI_ATTID_member,
                      drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
                      g_guid,
                      u2_guid),
-        AbstractLink(drsuapi.DRSUAPI_ATTID_member,
+            AbstractLink(drsuapi.DRSUAPI_ATTID_member,
                      drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
                      g_guid,
                      u3_guid),
-        AbstractLink(drsuapi.DRSUAPI_ATTID_managedBy,
+            AbstractLink(drsuapi.DRSUAPI_ATTID_managedBy,
                      drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
                      g_guid,
                      u1_guid),
-        AbstractLink(drsuapi.DRSUAPI_ATTID_nonSecurityMember,
+            AbstractLink(drsuapi.DRSUAPI_ATTID_nonSecurityMember,
                      drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
                      g_guid,
                      u2_guid),