sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-05 09:18:06 +03:00
Code

PEP8: fix E122: continuation line missing indentation or outdented

Browse Source 
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>
This commit is contained in:
Joe Guo 2018-07-30 18:14:21 +12:00 committed by Douglas Bagnall
parent b43408b383
commit 297faf3252
14 changed files with 305 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/dbchecker.py
View File

@ -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): if check_duplicates is True and self.has_duplicate_links(target_dn, forward_attr, forward_syntax):
self.report("WARNING: Keep orphaned backlink attribute " + \ self.report("WARNING: Keep orphaned backlink attribute " + \
"'%s' in '%s' for link '%s' in '%s'" % ( "'%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 return
self.report("ERROR: orphaned backlink attribute '%s' in %s for link %s in %s" % (backlink_attr, obj_dn, forward_attr, target_dn)) 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'): if not self.confirm_all('Remove orphaned backlink %s' % backlink_attr, 'fix_all_orphaned_backlinks'):

470
python/samba/descriptor.py
View File

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

8
python/samba/netcmd/domain.py
View File

@ -2465,7 +2465,7 @@ class cmd_domain_trust_create(DomainTrustCommand):
if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
raise self.LocalRuntimeError(self, error, raise self.LocalRuntimeError(self, error,
"QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
lsaString.string)) lsaString.string))
try: try:
lsaString.string = local_trust_info.netbios_name.string 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): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
raise self.LocalRuntimeError(self, error, raise self.LocalRuntimeError(self, error,
"QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
lsaString.string)) lsaString.string))
if remote_trust_info: if remote_trust_info:
try: 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): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
raise self.RemoteRuntimeError(self, error, raise self.RemoteRuntimeError(self, error,
"QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
lsaString.string)) lsaString.string))
try: try:
lsaString.string = remote_trust_info.netbios_name.string 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): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND):
raise self.RemoteRuntimeError(self, error, raise self.RemoteRuntimeError(self, error,
"QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % (
lsaString.string)) lsaString.string))
try: try:
local_netlogon = self.new_local_netlogon_connection() local_netlogon = self.new_local_netlogon_connection()

4
python/samba/netcmd/ldapcmp.py
View File

@ -578,7 +578,7 @@ class LDAPObject(object):
title = 4*" " + "Attributes found only in %s:" % self.con.host title = 4*" " + "Attributes found only in %s:" % self.con.host
for x in self.attributes.keys(): for x in self.attributes.keys():
if not x in other.attributes.keys() and \ 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: if title:
res += title + "\n" res += title + "\n"
title = None title = None
@ -588,7 +588,7 @@ class LDAPObject(object):
title = 4*" " + "Attributes found only in %s:" % other.con.host title = 4*" " + "Attributes found only in %s:" % other.con.host
for x in other.attributes.keys(): for x in other.attributes.keys():
if not x in self.attributes.keys() and \ 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: if title:
res += title + "\n" res += title + "\n"
title = None title = None

14
python/samba/provision/__init__.py
View File

@ -1477,8 +1477,8 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
logger.info("Modifying display specifiers and extended rights") logger.info("Modifying display specifiers and extended rights")
setup_modify_ldif(samdb, setup_modify_ldif(samdb,
setup_path("provision_configuration_modify.ldif"), { setup_path("provision_configuration_modify.ldif"), {
"CONFIGDN": names.configdn, "CONFIGDN": names.configdn,
"DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr
}) })
logger.info("Adding users container") 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') managedservice_descr = b64encode(get_managed_service_accounts_descriptor(names.domainsid)).decode('utf8')
setup_modify_ldif(samdb, setup_modify_ldif(samdb,
setup_path("provision_configuration_references.ldif"), { setup_path("provision_configuration_references.ldif"), {
"CONFIGDN": names.configdn, "CONFIGDN": names.configdn,
"SCHEMADN": names.schemadn}) "SCHEMADN": names.schemadn})
logger.info("Setting up well known security principals") logger.info("Setting up well known security principals")
protected1wd_descr = b64encode(get_config_delete_protected1wd_descriptor(names.domainsid)).decode('utf8') 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: try:
logger.info("Setting up fake yp server settings") logger.info("Setting up fake yp server settings")
setup_add_ldif(samdb, setup_path("ypServ30.ldif"), { setup_add_ldif(samdb, setup_path("ypServ30.ldif"), {
"DOMAINDN": domaindn, "DOMAINDN": domaindn,
"NETBIOSNAME": netbiosname, "NETBIOSNAME": netbiosname,
"NISDOMAIN": nisdomain, "NISDOMAIN": nisdomain,
}) })
except: except:
samdb.transaction_cancel() samdb.transaction_cancel()

2
python/samba/provision/backend.py
View File

@ -339,7 +339,7 @@ class OpenLDAPBackend(LDAPBackend):
self.schema = Schema(self.domainsid, self.schema = Schema(self.domainsid,
schemadn=self.names.schemadn, files=[ schemadn=self.names.schemadn, files=[
setup_path("schema_samba4.ldif")]) setup_path("schema_samba4.ldif")])
def setup_db_dir(self, dbdir): def setup_db_dir(self, dbdir):
"""Create a database directory. """Create a database directory.

24
python/samba/provision/sambadns.py
View File

@ -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): def add_domain_record(samdb, domaindn, prefix, dnsdomain, domainsid, dnsadmins_sid):
# DC=<DNSDOMAIN>,CN=MicrosoftDNS,<PREFIX>,<DOMAINDN> # DC=<DNSDOMAIN>,CN=MicrosoftDNS,<PREFIX>,<DOMAINDN>
sddl = "O:SYG:BAD:AI" \ sddl = "O:SYG:BAD:AI" \
"(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)" \ "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;DA)" \
"(A;;CC;;;AU)" \ "(A;;CC;;;AU)" \
"(A;;RPLCLORC;;;WD)" \ "(A;;RPLCLORC;;;WD)" \
"(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \ "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
"(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \ "(A;CI;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \
"(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;%s)" \ "(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;%s)" \
"(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \ "(A;CIID;RPWPCRCCDCLCRCWOWDSDDTSW;;;ED)" \
"(OA;CIID;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \ "(OA;CIID;RPWPCR;91e647de-d96f-4b70-9557-d63ff4f3ccd8;;PS)" \
"(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \ "(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
"(A;CIID;LC;;;RU)" \ "(A;CIID;LC;;;RU)" \
"(A;CIID;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \ "(A;CIID;RPWPCRCCLCLORCWOWDSDSW;;;BA)" \
"S:AI" % dnsadmins_sid "S:AI" % dnsadmins_sid
sec = security.descriptor.from_sddl(sddl, domainsid) sec = security.descriptor.from_sddl(sddl, domainsid)
props = [] props = []
props.append(ndr_pack(TypeProperty())) props.append(ndr_pack(TypeProperty()))

50
python/samba/tests/graph.py
View File

@ -183,7 +183,7 @@ elephant 2311·-
elephant 2311·- elephant 2311·-
 frog 23121·  frog 23121·
''', ''',
'utf8 True, colour xterm-256color-heatmap': ''' 'utf8 True, colour xterm-256color-heatmap': '''
destination destination
╭────── ant ╭────── ant
│╭───── bat │╭───── bat
@ -198,7 +198,7 @@ elephant 2311·-
elephant 2311·- elephant 2311·-
 frog 23121·  frog 23121·
''', ''',
'utf8 False, colour None': ''' 'utf8 False, colour None': '''
destination destination
,------ ant ,------ ant
|,----- bat |,----- bat
@ -213,7 +213,7 @@ elephant 2311·-
elephant 23110- elephant 23110-
frog 231210 frog 231210
''', ''',
'utf8 False, colour ansi': ''' 'utf8 False, colour ansi': '''
destination destination
,------ ant ,------ ant
|,----- bat |,----- bat
@ -228,7 +228,7 @@ elephant 23110-
elephant 23110- elephant 23110-
 frog 231210  frog 231210
''', ''',
'utf8 False, colour ansi-heatmap': ''' 'utf8 False, colour ansi-heatmap': '''
destination destination
,------ ant ,------ ant
|,----- bat |,----- bat
@ -243,7 +243,7 @@ elephant 23110-
elephant 23110- elephant 23110-
 frog 231210  frog 231210
''', ''',
'utf8 False, colour xterm-256color': ''' 'utf8 False, colour xterm-256color': '''
destination destination
,------ ant ,------ ant
|,----- bat |,----- bat
@ -258,7 +258,7 @@ elephant 23110-
elephant 23110- elephant 23110-
 frog 231210  frog 231210
''', ''',
'utf8 False, colour xterm-256color-heatmap': ''' 'utf8 False, colour xterm-256color-heatmap': '''
destination destination
,------ ant ,------ ant
|,----- bat |,----- bat
@ -306,7 +306,7 @@ source ││╭─ cat
 bat 1·2  bat 1·2
 cat 21·  cat 21·
''', ''',
'utf8 True, colour ansi-heatmap': ''' 'utf8 True, colour ansi-heatmap': '''
destination destination
╭─── ant ╭─── ant
│╭── bat │╭── bat
@ -315,7 +315,7 @@ source ││╭─ cat
 bat 1·2  bat 1·2
 cat 21·  cat 21·
''', ''',
'utf8 True, colour xterm-256color': ''' 'utf8 True, colour xterm-256color': '''
destination destination
╭─── ant ╭─── ant
│╭── bat │╭── bat
@ -324,7 +324,7 @@ source ││╭─ cat
 bat 1·2  bat 1·2
 cat 21·  cat 21·
''', ''',
'utf8 True, colour xterm-256color-heatmap': ''' 'utf8 True, colour xterm-256color-heatmap': '''
destination destination
╭─── ant ╭─── ant
│╭── bat │╭── bat
@ -333,7 +333,7 @@ source ││╭─ cat
 bat 1·2  bat 1·2
 cat 21·  cat 21·
''', ''',
'utf8 False, colour None': ''' 'utf8 False, colour None': '''
destination destination
,--- ant ,--- ant
|,-- bat |,-- bat
@ -342,7 +342,7 @@ source ||,- cat
bat 102 bat 102
cat 210 cat 210
''', ''',
'utf8 False, colour ansi': ''' 'utf8 False, colour ansi': '''
destination destination
,--- ant ,--- ant
|,-- bat |,-- bat
@ -351,7 +351,7 @@ source ||,- cat
 bat 102  bat 102
 cat 210  cat 210
''', ''',
'utf8 False, colour ansi-heatmap': ''' 'utf8 False, colour ansi-heatmap': '''
destination destination
,--- ant ,--- ant
|,-- bat |,-- bat
@ -360,7 +360,7 @@ source ||,- cat
 bat 102  bat 102
 cat 210  cat 210
''', ''',
'utf8 False, colour xterm-256color': ''' 'utf8 False, colour xterm-256color': '''
destination destination
,--- ant ,--- ant
|,-- bat |,-- bat
@ -369,7 +369,7 @@ source ||,- cat
 bat 102  bat 102
 cat 210  cat 210
''', ''',
'utf8 False, colour xterm-256color-heatmap': ''' 'utf8 False, colour xterm-256color-heatmap': '''
destination destination
,--- ant ,--- ant
|,-- bat |,-- bat
@ -394,7 +394,7 @@ source ||,- cat
('dog', 'ant'), ('dog', 'ant'),
('dog', 'eel')] ('dog', 'eel')]
expected = { expected = {
'utf8 True, colour None': ''' 'utf8 True, colour None': '''
destination destination
╭───── ant ╭───── ant
│╭──── bat │╭──── bat
@ -407,7 +407,7 @@ source ││││╭─ eel
dog 123·1 dog 123·1
eel ----· eel ----·
''', ''',
'utf8 True, colour ansi': ''' 'utf8 True, colour ansi': '''
destination destination
╭───── ant ╭───── ant
│╭──── bat │╭──── bat
@ -420,7 +420,7 @@ source ││││╭─ eel
 dog 123·1  dog 123·1
 eel ----·  eel ----·
''', ''',
'utf8 True, colour ansi-heatmap': ''' 'utf8 True, colour ansi-heatmap': '''
destination destination
╭───── ant ╭───── ant
│╭──── bat │╭──── bat
@ -433,7 +433,7 @@ source ││││╭─ eel
 dog 123·1  dog 123·1
 eel ----·  eel ----·
''', ''',
'utf8 True, colour xterm-256color': ''' 'utf8 True, colour xterm-256color': '''
destination destination
╭───── ant ╭───── ant
│╭──── bat │╭──── bat
@ -446,7 +446,7 @@ source ││││╭─ eel
 dog 123·1  dog 123·1
 eel ----·  eel ----·
''', ''',
'utf8 True, colour xterm-256color-heatmap': ''' 'utf8 True, colour xterm-256color-heatmap': '''
destination destination
╭───── ant ╭───── ant
│╭──── bat │╭──── bat
@ -459,7 +459,7 @@ source ││││╭─ eel
 dog 123·1  dog 123·1
 eel ----·  eel ----·
''', ''',
'utf8 False, colour None': ''' 'utf8 False, colour None': '''
destination destination
,----- ant ,----- ant
|,---- bat |,---- bat
@ -472,7 +472,7 @@ source ||||,- eel
dog 12301 dog 12301
eel ----0 eel ----0
''', ''',
'utf8 False, colour ansi': ''' 'utf8 False, colour ansi': '''
destination destination
,----- ant ,----- ant
|,---- bat |,---- bat
@ -485,7 +485,7 @@ source ||||,- eel
 dog 12301  dog 12301
 eel ----0  eel ----0
''', ''',
'utf8 False, colour ansi-heatmap': ''' 'utf8 False, colour ansi-heatmap': '''
destination destination
,----- ant ,----- ant
|,---- bat |,---- bat
@ -498,8 +498,8 @@ source ||||,- eel
 dog 12301  dog 12301
 eel ----0  eel ----0
''', ''',
'utf8 False, colour xterm-256color': 'utf8 False, colour xterm-256color':
''' destination ''' destination
,----- ant ,----- ant
|,---- bat |,---- bat
||,--- cat ||,--- cat
@ -511,7 +511,7 @@ source ||||,- eel
 dog 12301  dog 12301
 eel ----0  eel ----0
''', ''',
'utf8 False, colour xterm-256color-heatmap': ''' 'utf8 False, colour xterm-256color-heatmap': '''
destination destination
,----- ant ,----- ant
|,---- bat |,---- bat

2
python/samba/tests/samba_tool/user.py
View File

@ -381,7 +381,7 @@ company: %s
sAMAccountName: %s sAMAccountName: %s
""" % (user["given-name"], user["surname"], self.samdb.domain_dn(), """ % (user["given-name"], user["surname"], self.samdb.domain_dn(),
user["company"], user["name"]) user["company"], user["name"])
self.assertEqual(out, expected_out, self.assertEqual(out, expected_out,
"Unexpected show output for user '%s'" % "Unexpected show output for user '%s'" %

2
script/autobuild.py
View File

@ -490,7 +490,7 @@ class buildlist(object):
rebase_remote, rebase_branch, rebase_remote, rebase_branch,
rebase_remote, rebase_remote,
rebase_remote, rebase_branch rebase_remote, rebase_branch
), ),
"test/plain" ) ] "test/plain" ) ]
self.retry = builder('retry', retry_task, cp=False) self.retry = builder('retry', retry_task, cp=False)

4
source4/dsdb/tests/python/ndr_pack_performance.py
View File

@ -65,7 +65,7 @@ random.seed(1)
BIG_SD_SDDL = ''.join( 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-3328325300-3937145445-4190589019-512D:AI(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;S-
1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;; 1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;
SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O 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()) 80367c1;bf967aa5-0de6-11d0-a285-00aa003049e2;WD)""".split())
LITTLE_SD_SDDL = ''.join( 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-3328325300-3937145445-4190589019-512D:AI(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;S-
1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;; 1-5-21-3328325300-3937145445-4190589019-512)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;
SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O SY)(A;;RPLCLORC;;;AU)(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;AO)(A;;RPLCLORC;;;PS)(O

2
source4/dsdb/tests/python/sam.py
View File

@ -1797,7 +1797,7 @@ class SamTests(samba.tests.TestCase):
def assertLDAPErrorMsg(msg, expected_msg): def assertLDAPErrorMsg(msg, expected_msg):
self.assertTrue(expected_msg in msg, self.assertTrue(expected_msg in msg,
"msg[%s] does not contain expected[%s]" % ( "msg[%s] does not contain expected[%s]" % (
msg, expected_msg)) msg, expected_msg))
try: try:
ldb_fail = SamDB(url=host, credentials=sasl_wrong_creds, lp=lp) ldb_fail = SamDB(url=host, credentials=sasl_wrong_creds, lp=lp)

18
source4/selftest/tests.py
View File

@ -280,15 +280,15 @@ for bindoptions in ["sign", "seal"]:
for transport in transports: for transport in transports:
for bindoptions in ["sign", "seal"]: for bindoptions in ["sign", "seal"]:
for ntlmoptions in [ for ntlmoptions in [
"--option=ntlmssp_client:ntlm2=yes --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=no --option=torture:quick=yes",
"--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=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=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=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=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: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=yes --option=torture:quick=yes",
"--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]: "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]:
if transport == "ncalrpc": if transport == "ncalrpc":
env = "ad_dc_ntvfs:local" env = "ad_dc_ntvfs:local"
else: else:

8
source4/torture/drs/python/getnc_exop.py
View File

@ -1020,19 +1020,19 @@ class DrsReplicaSyncSortTestCase(drs_base.DrsBaseTestCase):
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE, drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid, g_guid,
u1_guid), u1_guid),
AbstractLink(drsuapi.DRSUAPI_ATTID_member, AbstractLink(drsuapi.DRSUAPI_ATTID_member,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE, drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid, g_guid,
u2_guid), u2_guid),
AbstractLink(drsuapi.DRSUAPI_ATTID_member, AbstractLink(drsuapi.DRSUAPI_ATTID_member,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE, drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid, g_guid,
u3_guid), u3_guid),
AbstractLink(drsuapi.DRSUAPI_ATTID_managedBy, AbstractLink(drsuapi.DRSUAPI_ATTID_managedBy,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE, drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid, g_guid,
u1_guid), u1_guid),
AbstractLink(drsuapi.DRSUAPI_ATTID_nonSecurityMember, AbstractLink(drsuapi.DRSUAPI_ATTID_nonSecurityMember,
drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE, drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE,
g_guid, g_guid,
u2_guid), u2_guid),