From 4fc08d8f14e281fb7492d5a196e456637406c514 Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Mon, 30 Jul 2018 18:13:57 +1200 Subject: PEP8: fix E111: indentation is not a multiple of four Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- python/examples/samr.py | 6 +-- python/samba/netcmd/__init__.py | 28 +++++----- python/samba/netcmd/domain.py | 58 ++++++++++----------- python/samba/netcmd/ldapcmp.py | 2 +- python/samba/provision/__init__.py | 2 +- python/samba/remove_dc.py | 2 +- python/samba/tests/docs.py | 10 ++-- script/generate_param.py | 14 ++--- selftest/subunithelper.py | 2 +- source4/dsdb/tests/python/acl.py | 62 +++++++++++------------ source4/dsdb/tests/python/dirsync.py | 2 +- source4/dsdb/tests/python/ldap_schema.py | 8 +-- source4/dsdb/tests/python/user_account_control.py | 8 +-- source4/scripting/devel/pfm_verify.py | 2 +- source4/scripting/devel/repl_cleartext_pwd.py | 60 +++++++++++----------- source4/torture/drs/python/repl_rodc.py | 58 ++++++++++----------- 16 files changed, 162 insertions(+), 162 deletions(-) diff --git a/python/examples/samr.py b/python/examples/samr.py index 9b8e31e434b..49559e82023 100755 --- a/python/examples/samr.py +++ b/python/examples/samr.py @@ -44,7 +44,7 @@ def toArray((handle, array, num_entries)): for x in range(num_entries): ret.append((array.entries[x].idx, array.entries[x].name)) return ret - + def test_Connect(samr): """test the samr_Connect interface""" @@ -98,8 +98,8 @@ def test_EnumDomains(samr, handle): samr.Close(dom_handle) if len(sys.argv) != 2: - print "Usage: samr.js " - sys.exit(1) + print "Usage: samr.js " + sys.exit(1) binding = sys.argv[1] diff --git a/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py index 9b144d97f43..ceb1be93113 100644 --- a/python/samba/netcmd/__init__.py +++ b/python/samba/netcmd/__init__.py @@ -29,17 +29,17 @@ class Option(optparse.Option): # This help formatter does text wrapping and preserves newlines class PlainHelpFormatter(optparse.IndentedHelpFormatter): def format_description(self,description=""): - desc_width = self.width - self.current_indent - indent = " "*self.current_indent - paragraphs = description.split('\n') - wrapped_paragraphs = [ - textwrap.fill(p, - desc_width, - initial_indent=indent, - subsequent_indent=indent) - for p in paragraphs] - result = "\n".join(wrapped_paragraphs) + "\n" - return result + desc_width = self.width - self.current_indent + indent = " "*self.current_indent + paragraphs = description.split('\n') + wrapped_paragraphs = [ + textwrap.fill(p, + desc_width, + initial_indent=indent, + subsequent_indent=indent) + for p in paragraphs] + result = "\n".join(wrapped_paragraphs) + "\n" + return result def format_epilog(self, epilog): if epilog: @@ -160,11 +160,11 @@ class Command(object): undetermined_max_args = False for i, arg in enumerate(self.takes_args): if arg[-1] != "?" and arg[-1] != "*": - min_args += 1 + min_args += 1 if arg[-1] == "+" or arg[-1] == "*": - undetermined_max_args = True + undetermined_max_args = True else: - max_args += 1 + max_args += 1 if (len(args) < min_args) or (not undetermined_max_args and len(args) > max_args): parser.print_usage() return -1 diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 9bdd17e3bcc..6f2e04b8ad7 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -156,31 +156,31 @@ def get_testparm_var(testparm, smbconf, varname): return "" try: - import samba.dckeytab + import samba.dckeytab except ImportError: - cmd_domain_export_keytab = None + cmd_domain_export_keytab = None else: - class cmd_domain_export_keytab(Command): - """Dump Kerberos keys of the domain into a keytab.""" + class cmd_domain_export_keytab(Command): + """Dump Kerberos keys of the domain into a keytab.""" - synopsis = "%prog [options]" + synopsis = "%prog [options]" - takes_optiongroups = { - "sambaopts": options.SambaOptions, - "credopts": options.CredentialsOptions, - "versionopts": options.VersionOptions, - } + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "credopts": options.CredentialsOptions, + "versionopts": options.VersionOptions, + } - takes_options = [ - Option("--principal", help="extract only this principal", type=str), - ] + takes_options = [ + Option("--principal", help="extract only this principal", type=str), + ] - takes_args = ["keytab"] + takes_args = ["keytab"] - def run(self, keytab, credopts=None, sambaopts=None, versionopts=None, principal=None): - lp = sambaopts.get_loadparm() - net = Net(None, lp) - net.export_keytab(keytab=keytab, principal=principal) + def run(self, keytab, credopts=None, sambaopts=None, versionopts=None, principal=None): + lp = sambaopts.get_loadparm() + net = Net(None, lp) + net.export_keytab(keytab=keytab, principal=principal) class cmd_domain_info(Command): @@ -597,7 +597,7 @@ class cmd_domain_dcpromo(Command): takes_options.extend(common_provision_join_options) if samba.is_ntvfs_fileserver_built(): - takes_options.extend(common_ntvfs_options) + takes_options.extend(common_ntvfs_options) takes_args = ["domain", "role?"] @@ -1893,7 +1893,7 @@ class DomainTrustCommand(Command): def netr_DomainTrust_to_name(self, t): if t.trust_type == lsa.LSA_TRUST_TYPE_DOWNLEVEL: - return t.netbios_name + return t.netbios_name return t.dns_name @@ -1901,11 +1901,11 @@ class DomainTrustCommand(Command): primary = None primary_parent = None for _t in a: - if _t.trust_flags & netlogon.NETR_TRUST_FLAG_PRIMARY: - primary = _t - if not _t.trust_flags & netlogon.NETR_TRUST_FLAG_TREEROOT: - primary_parent = a[_t.parent_index] - break + if _t.trust_flags & netlogon.NETR_TRUST_FLAG_PRIMARY: + primary = _t + if not _t.trust_flags & netlogon.NETR_TRUST_FLAG_TREEROOT: + primary_parent = a[_t.parent_index] + break if t.trust_flags & netlogon.NETR_TRUST_FLAG_IN_FOREST: if t is primary_parent: @@ -3432,10 +3432,10 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): self.outf.write("Stored uPNSuffixes attributes[%d]:\n" % len(stored_upn_vals)) for v in stored_upn_vals: - self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) + self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) self.outf.write("Stored msDS-SPNSuffixes attributes[%d]:\n" % len(stored_spn_vals)) for v in stored_spn_vals: - self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) + self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) if not require_update: return @@ -3494,10 +3494,10 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): self.outf.write("Update uPNSuffixes attributes[%d]:\n" % len(update_upn_vals)) for v in update_upn_vals: - self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) + self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) self.outf.write("Update msDS-SPNSuffixes attributes[%d]:\n" % len(update_spn_vals)) for v in update_spn_vals: - self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) + self.outf.write("TLN: %-32s DNS[*.%s]\n" % ("", v)) update_msg = ldb.Message() update_msg.dn = stored_msg.dn diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py index 4e5abad7cfe..2d302fa1e24 100644 --- a/python/samba/netcmd/ldapcmp.py +++ b/python/samba/netcmd/ldapcmp.py @@ -859,7 +859,7 @@ class LDAPBundel(object): self.outf.write("Failed search of base=%s\n" % self.search_base) raise for x in res: - dn_list.append(x["dn"].get_linearized()) + dn_list.append(x["dn"].get_linearized()) # global summary # diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 26d11a59ded..dd875f8065a 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -678,7 +678,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, dnsdomain = netbiosname.lower() if rootdn is None: - rootdn = domaindn + rootdn = domaindn if configdn is None: configdn = "CN=Configuration," + rootdn diff --git a/python/samba/remove_dc.py b/python/samba/remove_dc.py index e6513ae04fa..d814a8e8edd 100644 --- a/python/samba/remove_dc.py +++ b/python/samba/remove_dc.py @@ -309,7 +309,7 @@ def offline_remove_ntds_dc(samdb, except LdbError as e5: (enum, estr) = e5.args if enum == ldb.ERR_NO_SUCH_OBJECT: - raise DemoteException("Given DN %s doesn't exist" % ntds_dn) + raise DemoteException("Given DN %s doesn't exist" % ntds_dn) else: raise if (len(msgs) == 0): diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py index 0f029ae02d2..86cb06c3adf 100644 --- a/python/samba/tests/docs.py +++ b/python/samba/tests/docs.py @@ -50,7 +50,7 @@ def get_documented_parameters(sourcedir): for parameter in root: name = parameter.attrib.get('name') if parameter.attrib.get('removed') == "1": - continue + continue yield name syn = parameter.findall('synonym') if syn is not None: @@ -74,7 +74,7 @@ def get_documented_tuples(sourcedir, omit_no_default=True): name = parameter.attrib.get("name") param_type = parameter.attrib.get("type") if parameter.attrib.get('removed') == "1": - continue + continue values = parameter.findall("value") defaults = [] for value in values: @@ -193,7 +193,7 @@ class SmbDotConfTests(TestCase): elif context == "S": section = "test" else: - self.fail("%s has no valid context" % param) + self.fail("%s has no valid context" % param) p = subprocess.Popen(program + ["-s", self.smbconf, "--section-name", section, "--parameter-name", param], stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=self.topdir).communicate() @@ -223,7 +223,7 @@ class SmbDotConfTests(TestCase): elif context == "S": section = "test" else: - self.fail("%s has no valid context" % param) + self.fail("%s has no valid context" % param) p = subprocess.Popen(program + ["-s", self.smbconf, "--section-name", section, "--parameter-name", param, "--option", "%s = %s" % (param, default)], @@ -277,7 +277,7 @@ class SmbDotConfTests(TestCase): elif context == "S": section = "test" else: - self.fail("%s has no valid context" % param) + self.fail("%s has no valid context" % param) value_to_use = arbitrary.get(param_type) if value_to_use is None: diff --git a/script/generate_param.py b/script/generate_param.py index d31507c9cfc..c6ec8bc1448 100644 --- a/script/generate_param.py +++ b/script/generate_param.py @@ -119,8 +119,8 @@ param_type_dict = { def generate_functions(path_in, path_out): f = open(path_out, 'w') try: - f.write('/* This file was automatically generated by generate_param.py. DO NOT EDIT */\n\n') - for parameter in iterate_all(options.filename): + f.write('/* This file was automatically generated by generate_param.py. DO NOT EDIT */\n\n') + for parameter in iterate_all(options.filename): # filter out parameteric options if ':' in parameter['name']: continue @@ -181,7 +181,7 @@ def make_s3_param_proto(path_in, path_out): output_string += 'const ' param_type = mapping.get(parameter['type']) if param_type is None: - raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) + raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) output_string += param_type output_string += "lp_%s" % parameter['function'] @@ -231,7 +231,7 @@ def make_lib_proto(path_in, path_out): output_string += 'const ' param_type = mapping.get(parameter['type']) if param_type is None: - raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) + raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) output_string += param_type output_string += "lpcfg_%s" % parameter['function'] @@ -251,7 +251,7 @@ def make_lib_proto(path_in, path_out): else: raise Exception(parameter['name'] + " has an invalid param type " + parameter['type']) - + file_out.write(output_string) finally: file_out.close() @@ -282,7 +282,7 @@ def make_param_defs(path_in, path_out, scope): file_out.write("struct loadparm_service \n") file_out.write("{\n") file_out.write("\tbool autoloaded;\n") - + for parameter in iterate_all(path_in): # filter out parameteric options if ':' in parameter['name']: @@ -297,7 +297,7 @@ def make_param_defs(path_in, path_out, scope): output_string = "\t" param_type = mapping.get(parameter['type']) if param_type is None: - raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) + raise Exception(parameter['name'] + " has an invalid context " + parameter['context']) output_string += param_type output_string += " %s;\n" % parameter['function'] diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index f20f3fe8ba7..db9b3e77525 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -298,7 +298,7 @@ class FilterOps(unittest.TestResult): self.seen_output = True test = self._add_prefix(test) if self.strip_ok_output: - self.output = "" + self.output = "" self._ops.startTest(test) diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index 1df1c7b5ef7..8f4997876bd 100755 --- a/source4/dsdb/tests/python/acl.py +++ b/source4/dsdb/tests/python/acl.py @@ -866,8 +866,8 @@ class AclSearchTests(AclTests): print("Testing correct behavior on nonaccessible search base") try: - self.ldb_user3.search("OU=ou3,OU=ou2,OU=ou1," + self.base_dn, expression="(objectClass=*)", - scope=SCOPE_BASE) + self.ldb_user3.search("OU=ou3,OU=ou2,OU=ou1," + self.base_dn, expression="(objectClass=*)", + scope=SCOPE_BASE) except LdbError as e18: (num, _) = e18.args self.assertEquals(num, ERR_NO_SUCH_OBJECT) @@ -1959,35 +1959,35 @@ class AclSPNTests(AclTests): # same as for join_RODC, but do not set any SPNs def create_rodc(self, ctx): - ctx.nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] - ctx.full_nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] - ctx.krbtgt_dn = "CN=krbtgt_%s,CN=Users,%s" % (ctx.myname, ctx.base_dn) - - ctx.never_reveal_sid = [ "" % (ctx.domsid, security.DOMAIN_RID_RODC_DENY), - "" % security.SID_BUILTIN_ADMINISTRATORS, - "" % security.SID_BUILTIN_SERVER_OPERATORS, - "" % security.SID_BUILTIN_BACKUP_OPERATORS, - "" % security.SID_BUILTIN_ACCOUNT_OPERATORS ] - ctx.reveal_sid = "" % (ctx.domsid, security.DOMAIN_RID_RODC_ALLOW) - - mysid = ctx.get_mysid() - admin_dn = "" % mysid - ctx.managedby = admin_dn - - ctx.userAccountControl = (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT | - samba.dsdb.UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION | - samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT) - - ctx.connection_dn = "CN=RODC Connection (FRS),%s" % ctx.ntds_dn - ctx.secure_channel_type = misc.SEC_CHAN_RODC - ctx.RODC = True - ctx.replica_flags = (drsuapi.DRSUAPI_DRS_INIT_SYNC | - drsuapi.DRSUAPI_DRS_PER_SYNC | - drsuapi.DRSUAPI_DRS_GET_ANC | - drsuapi.DRSUAPI_DRS_NEVER_SYNCED | - drsuapi.DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING) - - ctx.join_add_objects() + ctx.nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] + ctx.full_nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] + ctx.krbtgt_dn = "CN=krbtgt_%s,CN=Users,%s" % (ctx.myname, ctx.base_dn) + + ctx.never_reveal_sid = [ "" % (ctx.domsid, security.DOMAIN_RID_RODC_DENY), + "" % security.SID_BUILTIN_ADMINISTRATORS, + "" % security.SID_BUILTIN_SERVER_OPERATORS, + "" % security.SID_BUILTIN_BACKUP_OPERATORS, + "" % security.SID_BUILTIN_ACCOUNT_OPERATORS ] + ctx.reveal_sid = "" % (ctx.domsid, security.DOMAIN_RID_RODC_ALLOW) + + mysid = ctx.get_mysid() + admin_dn = "" % mysid + ctx.managedby = admin_dn + + ctx.userAccountControl = (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT | + samba.dsdb.UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION | + samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT) + + ctx.connection_dn = "CN=RODC Connection (FRS),%s" % ctx.ntds_dn + ctx.secure_channel_type = misc.SEC_CHAN_RODC + ctx.RODC = True + ctx.replica_flags = (drsuapi.DRSUAPI_DRS_INIT_SYNC | + drsuapi.DRSUAPI_DRS_PER_SYNC | + drsuapi.DRSUAPI_DRS_GET_ANC | + drsuapi.DRSUAPI_DRS_NEVER_SYNCED | + drsuapi.DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING) + + ctx.join_add_objects() def create_dc(self, ctx): ctx.nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py index 136f4d3bba6..a8fb38890c6 100755 --- a/source4/dsdb/tests/python/dirsync.py +++ b/source4/dsdb/tests/python/dirsync.py @@ -154,7 +154,7 @@ class SimpleDirsyncTests(DirsyncBaseTests): expression="samaccountname=*", controls=["dirsync:1:0:1"]) except LdbError as l: - self.assertTrue(str(l).find("LDAP_INSUFFICIENT_ACCESS_RIGHTS") != -1) + self.assertTrue(str(l).find("LDAP_INSUFFICIENT_ACCESS_RIGHTS") != -1) def test_parentGUID_referrals(self): res2 = self.ldb_admin.search(self.base_dn, scope=SCOPE_BASE, attrs=["objectGUID"]) diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py index a510f40358d..669159c2d9e 100755 --- a/source4/dsdb/tests/python/ldap_schema.py +++ b/source4/dsdb/tests/python/ldap_schema.py @@ -165,11 +165,11 @@ systemMustContain: """ + attr_ldap_display_name + """ systemOnly: FALSE """ try: - self.ldb.add_ldif(ldif) - self.fail() + self.ldb.add_ldif(ldif) + self.fail() except LdbError as e1: - (num, _) = e1.args - self.assertEquals(num, ERR_CONSTRAINT_VIOLATION) + (num, _) = e1.args + self.assertEquals(num, ERR_CONSTRAINT_VIOLATION) ldif = """ dn: CN=%s,%s""" % (class_name, self.schema_dn) + """ diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py index de0c1c444e7..e185b63dbfe 100755 --- a/source4/dsdb/tests/python/user_account_control.py +++ b/source4/dsdb/tests/python/user_account_control.py @@ -311,11 +311,11 @@ class UserAccountControlTests(samba.tests.TestCase): m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_SERVER_TRUST_ACCOUNT), ldb.FLAG_MOD_REPLACE, "userAccountControl") try: - self.samdb.modify(m) - self.fail() + self.samdb.modify(m) + self.fail() except LdbError as e10: - (enum, estr) = e10.args - self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum) + (enum, estr) = e10.args + self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum) m = ldb.Message() m.dn = res[0].dn diff --git a/source4/scripting/devel/pfm_verify.py b/source4/scripting/devel/pfm_verify.py index 0c4f478348d..a8aafede2cf 100755 --- a/source4/scripting/devel/pfm_verify.py +++ b/source4/scripting/devel/pfm_verify.py @@ -159,7 +159,7 @@ if __name__ == "__main__": if len(args) != 1: import os if not "DC_SERVER" in os.environ.keys(): - parser.error("You must supply a server") + parser.error("You must supply a server") args.append(os.environ["DC_SERVER"]) if creds.is_anonymous(): diff --git a/source4/scripting/devel/repl_cleartext_pwd.py b/source4/scripting/devel/repl_cleartext_pwd.py index 0db87207152..d8a3285f099 100755 --- a/source4/scripting/devel/repl_cleartext_pwd.py +++ b/source4/scripting/devel/repl_cleartext_pwd.py @@ -63,13 +63,13 @@ class globals: def add_attr(self, dn, attname, vals): if dn not in self.global_objs: - self.global_objs[dn] = {} + self.global_objs[dn] = {} self.global_objs[dn][attname] = vals def print_all(self): for dn, obj in self.global_objs.items(): - self.ldif.unparse(dn, obj) - continue + self.ldif.unparse(dn, obj) + continue self.global_objs = {} def attid_equal(a1,a2): @@ -125,34 +125,34 @@ if __name__ == "__main__": gls = globals() try: - f = open(cookie_file, 'r') - store_blob = f.read() - f.close() - - store_hdr = store_blob[0:28] - (store_version, \ - store_dn_len, store_dn_ofs, \ - store_hwm_len, store_hwm_ofs, \ - store_utdv_len, store_utdv_ofs) = \ - struct.unpack("" % (ctx.domsid, security.DOMAIN_RID_RODC_DENY), - "" % security.SID_BUILTIN_ADMINISTRATORS, - "" % security.SID_BUILTIN_SERVER_OPERATORS, - "" % security.SID_BUILTIN_BACKUP_OPERATORS, - "" % security.SID_BUILTIN_ACCOUNT_OPERATORS ] - ctx.reveal_sid = "" % (ctx.domsid, security.DOMAIN_RID_RODC_ALLOW) - - mysid = ctx.get_mysid() - admin_dn = "" % mysid - ctx.managedby = admin_dn - - ctx.userAccountControl = (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT | - samba.dsdb.UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION | - samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT) - - ctx.connection_dn = "CN=RODC Connection (FRS),%s" % ctx.ntds_dn - ctx.secure_channel_type = misc.SEC_CHAN_RODC - ctx.RODC = True - ctx.replica_flags = (drsuapi.DRSUAPI_DRS_INIT_SYNC | - drsuapi.DRSUAPI_DRS_PER_SYNC | - drsuapi.DRSUAPI_DRS_GET_ANC | - drsuapi.DRSUAPI_DRS_NEVER_SYNCED | - drsuapi.DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING) - - ctx.join_add_objects() + ctx.nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] + ctx.full_nc_list = [ ctx.base_dn, ctx.config_dn, ctx.schema_dn ] + ctx.krbtgt_dn = "CN=krbtgt_%s,CN=Users,%s" % (ctx.myname, ctx.base_dn) + + ctx.never_reveal_sid = [ "" % (ctx.domsid, security.DOMAIN_RID_RODC_DENY), + "" % security.SID_BUILTIN_ADMINISTRATORS, + "" % security.SID_BUILTIN_SERVER_OPERATORS, + "" % security.SID_BUILTIN_BACKUP_OPERATORS, + "" % security.SID_BUILTIN_ACCOUNT_OPERATORS ] + ctx.reveal_sid = "" % (ctx.domsid, security.DOMAIN_RID_RODC_ALLOW) + + mysid = ctx.get_mysid() + admin_dn = "" % mysid + ctx.managedby = admin_dn + + ctx.userAccountControl = (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT | + samba.dsdb.UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION | + samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT) + + ctx.connection_dn = "CN=RODC Connection (FRS),%s" % ctx.ntds_dn + ctx.secure_channel_type = misc.SEC_CHAN_RODC + ctx.RODC = True + ctx.replica_flags = (drsuapi.DRSUAPI_DRS_INIT_SYNC | + drsuapi.DRSUAPI_DRS_PER_SYNC | + drsuapi.DRSUAPI_DRS_GET_ANC | + drsuapi.DRSUAPI_DRS_NEVER_SYNCED | + drsuapi.DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING) + + ctx.join_add_objects() -- cgit v1.2.1