PEP8: fix E127: continuation line over-indented for visual indent

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

diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index beb664da8f20157d8b1d8a677c04da708d8311fc..985ece3035070a46845dda551ed5703f96607264 100644 (file)
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -1453,7 +1453,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
         dn = ldb.Dn(self.samdb, "<GUID=%s>" % guid_str)
         res = self.samdb.search(base=dn, scope=ldb.SCOPE_BASE, attrs=[attr],
                                 controls=["search_options:1:2",
-                                            "show_recycled:1"])
+                                          "show_recycled:1"])
         msg = res[0]
         nmsg = ldb.Message()
         nmsg.dn = dn
@@ -2215,7 +2215,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
                 set_attrs_seen.add(str(attrname).lower())
 
             if syntax_oid in [dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_OR_NAME,
-                               dsdb.DSDB_SYNTAX_STRING_DN, ldb.SYNTAX_DN]:
+                              dsdb.DSDB_SYNTAX_STRING_DN, ldb.SYNTAX_DN]:
                 # it's some form of DN, do specialised checking on those
                 error_count += self.check_dn(obj, attrname, syntax_oid)
             else:

diff --git a/python/samba/gp_sec_ext.py b/python/samba/gp_sec_ext.py
index d74dd252fc13a79bf1d9dbcc4e6631a86098eea6..772f67839a3b2dd095829c9b377a9addb469d847 100644 (file)
--- a/python/samba/gp_sec_ext.py
+++ b/python/samba/gp_sec_ext.py
@@ -39,10 +39,10 @@ class inf_to_kdc_tdb(gp_ext_setter):
 
     def mapper(self):
         return {'kdc:user_ticket_lifetime': (self.set_kdc_tdb, self.explicit),
-                 'kdc:service_ticket_lifetime': (self.set_kdc_tdb,
-                                                 self.mins_to_hours),
-                 'kdc:renewal_lifetime': (self.set_kdc_tdb,
-                                          self.days_to_hours),
+                'kdc:service_ticket_lifetime': (self.set_kdc_tdb,
+                                                self.mins_to_hours),
+                'kdc:renewal_lifetime': (self.set_kdc_tdb,
+                                         self.days_to_hours),
                 }
 
     def __str__(self):
@@ -96,11 +96,11 @@ class inf_to_ldb(gp_ext_setter):
     def mapper(self):
         '''ldap value : samba setter'''
         return {"minPwdAge": (self.ch_minPwdAge, self.days2rel_nttime),
-                 "maxPwdAge": (self.ch_maxPwdAge, self.days2rel_nttime),
-                 # Could be none, but I like the method assignment in
-                 # update_samba
-                 "minPwdLength": (self.ch_minPwdLength, self.explicit),
-                 "pwdProperties": (self.ch_pwdProperties, self.explicit),
+                "maxPwdAge": (self.ch_maxPwdAge, self.days2rel_nttime),
+                # Could be none, but I like the method assignment in
+                # update_samba
+                "minPwdLength": (self.ch_minPwdLength, self.explicit),
+                "pwdProperties": (self.ch_pwdProperties, self.explicit),
 
                 }
 

diff --git a/python/samba/join.py b/python/samba/join.py
index 793cab536edba54298f23f22ef6db2b126e72b88..f111dcc8c3b9ea42cc2ce20c53f2438a4d621652 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -147,8 +147,8 @@ class DCJoinContext(object):
                 ctx.topology_dn = None
 
             ctx.SPNs = ["HOST/%s" % ctx.myname,
-                         "HOST/%s" % ctx.dnshostname,
-                         "GC/%s/%s" % (ctx.dnshostname, ctx.dnsforest)]
+                        "HOST/%s" % ctx.dnshostname,
+                        "GC/%s/%s" % (ctx.dnshostname, ctx.dnsforest)]
 
             res_rid_manager = ctx.samdb.search(scope=ldb.SCOPE_BASE,
                                                attrs=["rIDManagerReference"],
@@ -417,7 +417,7 @@ class DCJoinContext(object):
             "dn": ctx.krbtgt_dn,
             "objectclass": "user",
             "useraccountcontrol": str(samba.dsdb.UF_NORMAL_ACCOUNT |
-                                       samba.dsdb.UF_ACCOUNTDISABLE),
+                                      samba.dsdb.UF_ACCOUNTDISABLE),
             "showinadvancedviewonly": "TRUE",
             "description": "krbtgt for %s" % ctx.samname}
         ctx.samdb.add(rec, ["rodc_join:1:1"])
@@ -632,8 +632,8 @@ class DCJoinContext(object):
                 "objectclass": "server",
                 # windows uses 50000000 decimal for systemFlags. A windows hex/decimal mixup bug?
                 "systemFlags": str(samba.dsdb.SYSTEM_FLAG_CONFIG_ALLOW_RENAME |
-                                    samba.dsdb.SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE |
-                                    samba.dsdb.SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE),
+                                   samba.dsdb.SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE |
+                                   samba.dsdb.SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE),
                 # windows seems to add the dnsHostName later
                 "dnsHostName": ctx.dnshostname}
 
@@ -1445,13 +1445,13 @@ def join_RODC(logger=None, server=None, creds=None, lp=None, site=None, netbios_
                               samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT)
 
     ctx.SPNs.extend(["RestrictedKrbHost/%s" % ctx.myname,
-                      "RestrictedKrbHost/%s" % ctx.dnshostname])
+                     "RestrictedKrbHost/%s" % ctx.dnshostname])
 
     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_SPECIAL_SECRET_PROCESSING |
-                           drsuapi.DRSUAPI_DRS_GET_ALL_GROUP_MEMBERSHIP)
+                          drsuapi.DRSUAPI_DRS_GET_ALL_GROUP_MEMBERSHIP)
     ctx.domain_replica_flags = ctx.replica_flags
     if domain_critical_only:
         ctx.domain_replica_flags |= drsuapi.DRSUAPI_DRS_CRITICAL_ONLY

diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index 63ab346e0bdc2a85845736c25973463d144c6718..783a1d5fef075bd713a5f833ff01deed646e7f93 100644 (file)
--- a/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
@@ -87,53 +87,53 @@ def bitmap_string(module, bitmap_defs, value):
 
 def boot_method_string(boot_method):
     enum_defs = ['DNS_BOOT_METHOD_UNINITIALIZED', 'DNS_BOOT_METHOD_FILE',
-                  'DNS_BOOT_METHOD_REGISTRY', 'DNS_BOOT_METHOD_DIRECTORY']
+                 'DNS_BOOT_METHOD_REGISTRY', 'DNS_BOOT_METHOD_DIRECTORY']
     return enum_string(dnsserver, enum_defs, boot_method)
 
 
 def name_check_flag_string(check_flag):
     enum_defs = ['DNS_ALLOW_RFC_NAMES_ONLY', 'DNS_ALLOW_NONRFC_NAMES',
-                  'DNS_ALLOW_MULTIBYTE_NAMES', 'DNS_ALLOW_ALL_NAMES']
+                 'DNS_ALLOW_MULTIBYTE_NAMES', 'DNS_ALLOW_ALL_NAMES']
     return enum_string(dnsserver, enum_defs, check_flag)
 
 
 def zone_type_string(zone_type):
     enum_defs = ['DNS_ZONE_TYPE_CACHE', 'DNS_ZONE_TYPE_PRIMARY',
-                  'DNS_ZONE_TYPE_SECONDARY', 'DNS_ZONE_TYPE_STUB',
-                  'DNS_ZONE_TYPE_FORWARDER', 'DNS_ZONE_TYPE_SECONDARY_CACHE']
+                 'DNS_ZONE_TYPE_SECONDARY', 'DNS_ZONE_TYPE_STUB',
+                 'DNS_ZONE_TYPE_FORWARDER', 'DNS_ZONE_TYPE_SECONDARY_CACHE']
     return enum_string(dnsp, enum_defs, zone_type)
 
 
 def zone_update_string(zone_update):
     enum_defs = ['DNS_ZONE_UPDATE_OFF', 'DNS_ZONE_UPDATE_UNSECURE',
-                  'DNS_ZONE_UPDATE_SECURE']
+                 'DNS_ZONE_UPDATE_SECURE']
     return enum_string(dnsp, enum_defs, zone_update)
 
 
 def zone_secondary_security_string(security):
     enum_defs = ['DNS_ZONE_SECSECURE_NO_SECURITY', 'DNS_ZONE_SECSECURE_NS_ONLY',
-                  'DNS_ZONE_SECSECURE_LIST_ONLY', 'DNS_ZONE_SECSECURE_NO_XFER']
+                 'DNS_ZONE_SECSECURE_LIST_ONLY', 'DNS_ZONE_SECSECURE_NO_XFER']
     return enum_string(dnsserver, enum_defs, security)
 
 
 def zone_notify_level_string(notify_level):
     enum_defs = ['DNS_ZONE_NOTIFY_OFF', 'DNS_ZONE_NOTIFY_ALL_SECONDARIES',
-                  'DNS_ZONE_NOTIFY_LIST_ONLY']
+                 'DNS_ZONE_NOTIFY_LIST_ONLY']
     return enum_string(dnsserver, enum_defs, notify_level)
 
 
 def dp_flags_string(dp_flags):
     bitmap_defs = ['DNS_DP_AUTOCREATED', 'DNS_DP_LEGACY', 'DNS_DP_DOMAIN_DEFAULT',
-                    'DNS_DP_FOREST_DEFAULT', 'DNS_DP_ENLISTED', 'DNS_DP_DELETED']
+                   'DNS_DP_FOREST_DEFAULT', 'DNS_DP_ENLISTED', 'DNS_DP_DELETED']
     return bitmap_string(dnsserver, bitmap_defs, dp_flags)
 
 
 def zone_flags_string(flags):
     bitmap_defs = ['DNS_RPC_ZONE_PAUSED', 'DNS_RPC_ZONE_SHUTDOWN',
-                    'DNS_RPC_ZONE_REVERSE', 'DNS_RPC_ZONE_AUTOCREATED',
-                    'DNS_RPC_ZONE_DSINTEGRATED', 'DNS_RPC_ZONE_AGING',
-                    'DNS_RPC_ZONE_UPDATE_UNSECURE', 'DNS_RPC_ZONE_UPDATE_SECURE',
-                    'DNS_RPC_ZONE_READONLY']
+                   'DNS_RPC_ZONE_REVERSE', 'DNS_RPC_ZONE_AUTOCREATED',
+                   'DNS_RPC_ZONE_DSINTEGRATED', 'DNS_RPC_ZONE_AGING',
+                   'DNS_RPC_ZONE_UPDATE_UNSECURE', 'DNS_RPC_ZONE_UPDATE_SECURE',
+                   'DNS_RPC_ZONE_READONLY']
     return bitmap_string(dnsserver, bitmap_defs, flags)
 
 

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index 13a7802b5ae90b860bad957ad8bc8f0639d57051..e4ea7ba36972183c8cc0465f2c340c3e74b3297b 100644 (file)
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -449,7 +449,7 @@ class cmd_list(Command):
             raise CommandError("Failed to find objectClass for user %s" % username)
 
         session_info_flags = (AUTH_SESSION_INFO_DEFAULT_GROUPS |
-                               AUTH_SESSION_INFO_AUTHENTICATED)
+                              AUTH_SESSION_INFO_AUTHENTICATED)
 
         # When connecting to a remote server, don't look up the local privilege DB
         if self.url is not None and self.url.startswith('ldap'):
@@ -1225,8 +1225,8 @@ class cmd_create(Command):
 
             # Get new security descriptor
             ds_sd_flags = (security.SECINFO_OWNER |
-                            security.SECINFO_GROUP |
-                            security.SECINFO_DACL)
+                           security.SECINFO_GROUP |
+                           security.SECINFO_DACL)
             msg = get_gpo_info(self.samdb, gpo=gpo, sd_flags=ds_sd_flags)[0]
             ds_sd_ndr = msg['nTSecurityDescriptor'][0]
             ds_sd = ndr_unpack(security.descriptor, ds_sd_ndr).as_sddl()
@@ -1241,9 +1241,9 @@ class cmd_create(Command):
 
             # Set ACL
             sio = (security.SECINFO_OWNER |
-                    security.SECINFO_GROUP |
-                    security.SECINFO_DACL |
-                    security.SECINFO_PROTECTED_DACL)
+                   security.SECINFO_GROUP |
+                   security.SECINFO_DACL |
+                   security.SECINFO_PROTECTED_DACL)
             conn.set_acl(sharepath, fs_sd, sio)
 
             # Copy GPO files over SMB

diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index bbeab76a05df121ba4a2c9ec2a4ff751982ab448..5158357def834080e05df417a3696fdf615ab2c0 100644 (file)
--- a/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
@@ -568,7 +568,7 @@ Example3 shows how to display a users objectGUID and member attributes.
 
         filter = ("(&(sAMAccountType=%d)(sAMAccountName=%s))" %
                   (ATYPE_SECURITY_GLOBAL_GROUP,
-                    ldb.binary_encode(groupname)))
+                   ldb.binary_encode(groupname)))
 
         domaindn = samdb.domain_dn()
 

diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index a644b0a418028868375a4bb92f30d6fd65d2eb93..231aaa1cb95b6165e23ff84301f3885cbe2e46f8 100644 (file)
--- a/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
@@ -500,8 +500,8 @@ class LDAPObject(object):
             #
             # May contain DOMAIN_NETBIOS and SERVER_NAME
             self.servername_attributes = ["distinguishedName", "name", "CN", "sAMAccountName", "dNSHostName",
-                                           "servicePrincipalName", "rIDSetReferences", "serverReference", "serverReferenceBL",
-                                           "msDS-IsDomainFor", "interSiteTopologyGenerator", ]
+                                          "servicePrincipalName", "rIDSetReferences", "serverReference", "serverReferenceBL",
+                                          "msDS-IsDomainFor", "interSiteTopologyGenerator", ]
             self.servername_attributes = [x.upper() for x in self.servername_attributes]
             #
             self.netbios_attributes = ["servicePrincipalName", "CN", "distinguishedName", "nETBIOSName", "name", ]

diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index 5b7cd00befb10d822245dc8604d081c07e38b75e..4d11690a7672f09888aba5cebbb55b214029efc6 100644 (file)
--- a/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
@@ -318,13 +318,13 @@ class OpenLDAPBackend(LDAPBackend):
                  ol_mmr_urls=None, nosync=False, ldap_backend_forced_uri=None):
         from samba.provision import setup_path
         super(OpenLDAPBackend, self).__init__(backend_type=backend_type,
-                                               paths=paths, lp=lp,
-                                               names=names, logger=logger,
-                                               domainsid=domainsid, schema=schema, hostname=hostname,
-                                               ldapadminpass=ldapadminpass, slapd_path=slapd_path,
-                                               ldap_backend_extra_port=ldap_backend_extra_port,
-                                               ldap_backend_forced_uri=ldap_backend_forced_uri,
-                                               ldap_dryrun_mode=ldap_dryrun_mode)
+                                              paths=paths, lp=lp,
+                                              names=names, logger=logger,
+                                              domainsid=domainsid, schema=schema, hostname=hostname,
+                                              ldapadminpass=ldapadminpass, slapd_path=slapd_path,
+                                              ldap_backend_extra_port=ldap_backend_extra_port,
+                                              ldap_backend_forced_uri=ldap_backend_forced_uri,
+                                              ldap_dryrun_mode=ldap_dryrun_mode)
 
         self.ol_mmr_urls = ol_mmr_urls
         self.nosync = nosync
@@ -529,8 +529,8 @@ class OpenLDAPBackend(LDAPBackend):
         cn_samba = read_and_sub_file(
             setup_path("cn=samba.ldif"),
             {"LDAPADMINPASS": self.ldapadminpass,
-              "MMR_PASSWORD": mmr_pass,
-              "MMR": mmr})
+             "MMR_PASSWORD": mmr_pass,
+             "MMR": mmr})
 
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"
@@ -718,11 +718,11 @@ class FDSBackend(LDAPBackend):
                 refint_config += read_and_sub_file(
                     setup_path("fedorads-refint-add.ldif"),
                     {"ARG_NUMBER": str(argnum),
-                           "LINK_ATTR": attr})
+                     "LINK_ATTR": attr})
                 memberof_config += read_and_sub_file(
                     setup_path("fedorads-linked-attributes.ldif"),
                     {"MEMBER_ATTR": attr,
-                           "MEMBEROF_ATTR": lnkattr[attr]})
+                     "MEMBEROF_ATTR": lnkattr[attr]})
                 index_config += read_and_sub_file(
                     setup_path("fedorads-index.ldif"), {"ATTR": attr})
                 argnum += 1

diff --git a/python/samba/remove_dc.py b/python/samba/remove_dc.py
index fd14a596029091753f3df83a3383e9a15b2f1b1e..03cd5fdab9eb2efa31033b0fb7054635cea05f7c 100644 (file)
--- a/python/samba/remove_dc.py
+++ b/python/samba/remove_dc.py
@@ -198,7 +198,7 @@ def remove_hanging_dns_references(samdb, logger, dnsHostNameUpper, zones):
 
             # Remove references to dnsHostName in A, AAAA, NS, CNAME and SRV
             values = [ndr_unpack(dnsp.DnssrvRpcRecord, v)
-                       for v in orig_values if not to_remove(v)]
+                      for v in orig_values if not to_remove(v)]
 
             if len(values) != len(orig_values):
                 logger.info("updating %s keeping %d values, removing %s values"

diff --git a/python/samba/schema.py b/python/samba/schema.py
index 44e0e6364b4a50fe153487c3713279a1989027cc..6f71dd8fa4064f5d696ec4050cc7c3fd09dc3980 100644 (file)
--- a/python/samba/schema.py
+++ b/python/samba/schema.py
@@ -66,17 +66,17 @@ class Schema(object):
     # the schema files (and corresponding object version) that we know about
     base_schemas = {
         "2008_R2_old": ("MS-AD_Schema_2K8_R2_Attributes.txt",
-                         "MS-AD_Schema_2K8_R2_Classes.txt",
-                         47),
+                        "MS-AD_Schema_2K8_R2_Classes.txt",
+                        47),
        "2008_R2": ("Attributes_for_AD_DS__Windows_Server_2008_R2.ldf",
-                    "Classes_for_AD_DS__Windows_Server_2008_R2.ldf",
-                    47),
+                   "Classes_for_AD_DS__Windows_Server_2008_R2.ldf",
+                   47),
        "2012": ("AD_DS_Attributes__Windows_Server_2012.ldf",
-                    "AD_DS_Classes__Windows_Server_2012.ldf",
-                    56),
+                "AD_DS_Classes__Windows_Server_2012.ldf",
+                56),
        "2012_R2": ("AD_DS_Attributes__Windows_Server_2012_R2.ldf",
-                    "AD_DS_Classes__Windows_Server_2012_R2.ldf",
-                    69),
+                   "AD_DS_Classes__Windows_Server_2012_R2.ldf",
+                   69),
     }
 
     def __init__(self, domain_sid, invocationid=None, schemadn=None,

diff --git a/python/samba/tests/dcerpc/raw_protocol.py b/python/samba/tests/dcerpc/raw_protocol.py
index 4ee1cb3593d68de68b830aec9402a1413b1b2e41..6c4deea38166375890e4d3f45b2a26b4f9b50d77 100755 (executable)
--- a/python/samba/tests/dcerpc/raw_protocol.py
+++ b/python/samba/tests/dcerpc/raw_protocol.py
@@ -1947,7 +1947,7 @@ class TestDCERPC_BIND(RawDCERPCTest):
             computer_utf16 = computer.encode('utf-16-le')
 
         real_stub = struct.pack('<IIII', 0x00200000,
-                                 len(server) + 1, 0, len(server) + 1)
+                                len(server) + 1, 0, len(server) + 1)
         real_stub += server_utf16 + b'\x00\x00'
         mod_len = len(real_stub) % 4
         if mod_len != 0:

diff --git a/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py
index bb8eff26a900d3d8057d2176864dd2acfb84f439..5f486c774906ff9b9549982a1d525ff80a3be1eb 100644 (file)
--- a/python/samba/tests/samba3sam.py
+++ b/python/samba/tests/samba3sam.py
@@ -34,7 +34,7 @@ from operator import attrgetter
 
 def read_datafile(filename):
     paths = ["../../../../../testdata/samba3",
-              "../../../../testdata/samba3"]
+             "../../../../testdata/samba3"]
     for p in paths:
         datadir = os.path.join(os.path.dirname(__file__), p)
         if os.path.exists(datadir):

diff --git a/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py
index 049a7e94d6630070cf0db9afdf7f50f88ddee3b0..7a5fd96a077d5d8aa95151b810d79e93c8ead3ab 100644 (file)
--- a/python/samba/tests/samba_tool/group.py
+++ b/python/samba/tests/samba_tool/group.py
@@ -82,10 +82,10 @@ class GroupCmdTestCase(SambaToolCmdTest):
         # test adding groups
         for group in self.groups:
             (result, out, err) = self.runsubcmd("group", "add", group["name"],
-                                                 "--description=%s" % group["description"],
-                                                 "-H", "ldap://%s" % os.environ["DC_SERVER"],
-                                                 "-U%s%%%s" % (os.environ["DC_USERNAME"],
-                                                               os.environ["DC_PASSWORD"]))
+                                                "--description=%s" % group["description"],
+                                                "-H", "ldap://%s" % os.environ["DC_SERVER"],
+                                                "-U%s%%%s" % (os.environ["DC_USERNAME"],
+                                                              os.environ["DC_PASSWORD"]))
 
             self.assertCmdSuccess(result, out, err)
             self.assertEquals(err, "", "There shouldn't be any error message")

diff --git a/python/samba/tests/samba_tool/ntacl.py b/python/samba/tests/samba_tool/ntacl.py
index 2be9d725c130345041b5e91446099977905c31d5..e8fee852651578ae00e9fffa6002b1699803ca06 100644 (file)
--- a/python/samba/tests/samba_tool/ntacl.py
+++ b/python/samba/tests/samba_tool/ntacl.py
@@ -30,14 +30,14 @@ class NtACLCmdSysvolTestCase(SambaToolCmdTest):
 
     def test_ntvfs(self):
         (result, out, err) = self.runsubcmd("ntacl", "sysvolreset",
-                                             "--use-ntvfs")
+                                            "--use-ntvfs")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(out, "", "Shouldn't be any output messages")
         self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err)
 
     def test_s3fs(self):
         (result, out, err) = self.runsubcmd("ntacl", "sysvolreset",
-                                             "--use-s3fs")
+                                            "--use-s3fs")
 
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(err, "", "Shouldn't be any error messages")
@@ -45,7 +45,7 @@ class NtACLCmdSysvolTestCase(SambaToolCmdTest):
 
     def test_ntvfs_check(self):
         (result, out, err) = self.runsubcmd("ntacl", "sysvolreset",
-                                             "--use-ntvfs")
+                                            "--use-ntvfs")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(out, "", "Shouldn't be any output messages")
         self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err)
@@ -57,7 +57,7 @@ class NtACLCmdSysvolTestCase(SambaToolCmdTest):
 
     def test_s3fs_check(self):
         (result, out, err) = self.runsubcmd("ntacl", "sysvolreset",
-                                             "--use-s3fs")
+                                            "--use-s3fs")
 
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(err, "", "Shouldn't be any error messages")
@@ -81,7 +81,7 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest):
         open(tempf, 'w').write("empty")
 
         (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf,
-                                             "--use-ntvfs")
+                                            "--use-ntvfs")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(out, "", "Shouldn't be any output messages")
         self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err)
@@ -92,7 +92,7 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest):
         open(tempf, 'w').write("empty")
 
         (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf,
-                                             "--use-s3fs")
+                                            "--use-s3fs")
 
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(err, "", "Shouldn't be any error messages")
@@ -104,14 +104,14 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest):
         open(tempf, 'w').write("empty")
 
         (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf,
-                                             "--use-ntvfs")
+                                            "--use-ntvfs")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(out, "", "Shouldn't be any output messages")
         self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err)
 
         # Now check they were set correctly
         (result, out, err) = self.runsubcmd("ntacl", "get", tempf,
-                                             "--use-ntvfs", "--as-sddl")
+                                            "--use-ntvfs", "--as-sddl")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(err, "", "Shouldn't be any error messages")
         self.assertEquals(self.acl + "\n", out, "Output should be the ACL")
@@ -122,14 +122,14 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest):
         open(tempf, 'w').write("empty")
 
         (result, out, err) = self.runsubcmd("ntacl", "set", self.acl, tempf,
-                                             "--use-s3fs")
+                                            "--use-s3fs")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(out, "", "Shouldn't be any output messages")
         self.assertEquals(err, "", "Shouldn't be any error messages")
 
         # Now check they were set correctly
         (result, out, err) = self.runsubcmd("ntacl", "get", tempf,
-                                             "--use-s3fs", "--as-sddl")
+                                            "--use-s3fs", "--as-sddl")
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(err, "", "Shouldn't be any error messages")
         self.assertEquals(self.acl + "\n", out, "Output should be the ACL")

diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py
index be090030afd15ed8eb83c4b7d50a81d5c63374e7..750d9ad8e5ab668678e0a3ad57a809f165721638 100644 (file)
--- a/python/samba/tests/samba_tool/user.py
+++ b/python/samba/tests/samba_tool/user.py
@@ -92,15 +92,15 @@ class UserCmdTestCase(SambaToolCmdTest):
         # test adding users with --use-username-as-cn
         for user in self.users:
             (result, out, err) = self.runsubcmd("user", "create", user["name"], user["password"],
-                                                 "--use-username-as-cn",
-                                                 "--surname=%s" % user["surname"],
-                                                 "--given-name=%s" % user["given-name"],
-                                                 "--job-title=%s" % user["job-title"],
-                                                 "--department=%s" % user["department"],
-                                                 "--description=%s" % user["description"],
-                                                 "--company=%s" % user["company"],
-                                                 "-H", "ldap://%s" % os.environ["DC_SERVER"],
-                                                 "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
+                                                "--use-username-as-cn",
+                                                "--surname=%s" % user["surname"],
+                                                "--given-name=%s" % user["given-name"],
+                                                "--job-title=%s" % user["job-title"],
+                                                "--department=%s" % user["department"],
+                                                "--description=%s" % user["description"],
+                                                "--company=%s" % user["company"],
+                                                "-H", "ldap://%s" % os.environ["DC_SERVER"],
+                                                "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"]))
 
             self.assertCmdSuccess(result, out, err)
             self.assertEquals(err, "", "Shouldn't be any error messages")

diff --git a/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
index c6d4de3af6e1c535e5f58ef47e5e8588459af460..b665e5ba3c73a64a5c56b9aaa03ccdaadd2be08e 100644 (file)
--- a/python/samba/tests/upgradeprovisionneeddc.py
+++ b/python/samba/tests/upgradeprovisionneeddc.py
@@ -107,7 +107,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
                                                hash)
         self.assertEqual(self.ldbs.sam.get_attribute_replmetadata_version(dn,
                                                                           "unicodePwd"),
-                            140)
+                         140)
         # This function should not decrement the version
         hash[dn.lower()] = 130
 
@@ -116,7 +116,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
                                                hash)
         self.assertEqual(self.ldbs.sam.get_attribute_replmetadata_version(dn,
                                                                           "unicodePwd"),
-                            140)
+                         140)
 
     def test_identic_rename(self):
         rootdn = "DC=samba,DC=example,DC=com"

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 30796128f0cba4bd7b8cb0f2b6d6a9e320dbf02a..e03c02c018f817e6696571a83e8637132d5fc0ce 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -229,20 +229,20 @@ t = "--krb5auth=$DOMAIN/$DC_USERNAME%$DC_PASSWORD"
 plantestsuite("samba3.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
 plantestsuite("samba3.wbinfo_name_lookup", env,
               [os.path.join(srcdir(),
-                             "nsswitch/tests/test_wbinfo_name_lookup.sh"),
-                '$DOMAIN', '$REALM', '$DC_USERNAME'])
+                            "nsswitch/tests/test_wbinfo_name_lookup.sh"),
+               '$DOMAIN', '$REALM', '$DC_USERNAME'])
 
 env = "ad_member:local"
 plantestsuite("samba3.wbinfo_user_info", env,
               [os.path.join(srcdir(),
-                             "nsswitch/tests/test_wbinfo_user_info.sh"),
-                '$DOMAIN', '$REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe'])
+                            "nsswitch/tests/test_wbinfo_user_info.sh"),
+               '$DOMAIN', '$REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe'])
 
 env = "fl2008r2dc:local"
 plantestsuite("samba3.wbinfo_user_info", env,
               [os.path.join(srcdir(),
-                             "nsswitch/tests/test_wbinfo_user_info.sh"),
-                '$TRUST_DOMAIN', '$TRUST_REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe'])
+                            "nsswitch/tests/test_wbinfo_user_info.sh"),
+               '$TRUST_DOMAIN', '$TRUST_REALM', '$DOMAIN', 'alice', 'alice', 'jane', 'jane.doe'])
 
 env = "ad_member"
 t = "WBCLIENT-MULTI-PING"
@@ -645,8 +645,8 @@ plantestsuite("samba3.blackbox.sharesec", "simpleserver:local",
 
 plantestsuite("samba3.blackbox.net_tdb", "simpleserver:local",
               [os.path.join(samba3srcdir, "script/tests/test_net_tdb.sh"),
-                smbclient3, '$SERVER', 'tmp', '$USERNAME', '$PASSWORD',
-                configuration, '$LOCAL_PATH', '$LOCK_DIR'])
+               smbclient3, '$SERVER', 'tmp', '$USERNAME', '$PASSWORD',
+               configuration, '$LOCAL_PATH', '$LOCK_DIR'])
 
 plantestsuite("samba3.blackbox.smbd_error", "simpleserver:local",
               [os.path.join(samba3srcdir, "script/tests/test_smbd_error.sh")])
@@ -656,7 +656,7 @@ plantestsuite("samba3.blackbox.durable_v2_delay", "simpleserver:local",
 
 plantestsuite("samba3.blackbox.net_cache_samlogon", "ad_member:local",
               [os.path.join(samba3srcdir, "script/tests/test_net_cache_samlogon.sh"),
-                '$SERVER', 'tmp', '$DC_USERNAME', '$DC_PASSWORD'])
+               '$SERVER', 'tmp', '$DC_USERNAME', '$DC_PASSWORD'])
 
 plantestsuite("samba3.blackbox.net_dom_join_fail_dc", "nt4_dc",
               [os.path.join(samba3srcdir, "script/tests/test_net_dom_join_fail_dc.sh"),

diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index 0dffddeeb36da7de23d27a9db4db99784a5f5bd1..20963c0150d5000a511a3e4cd9cf4a6125a6e003 100755 (executable)
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -181,8 +181,8 @@ def pull_classinfo(db):
         else:
             classinfo[name]["objectClassCategory"] = 0
         for a in ["possSuperiors", "systemPossSuperiors",
-                   "auxiliaryClass", "systemAuxiliaryClass",
-                   "subClassOf"]:
+                  "auxiliaryClass", "systemAuxiliaryClass",
+                  "subClassOf"]:
             classinfo[name][a] = []
             if r.get(a):
                 for i in r[a]:

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 0ab388465668d4a6984bd294ee6a37900cc284e8..ab3e1fa3235b2fe30166a0d97173860ab0d1966e 100755 (executable)
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -565,7 +565,7 @@ Member: """ + self.get_user_dn(self.user_with_sm)
         self.sd_utils.dacl_add_ace("CN=test_modify_group2,CN=Users," + self.base_dn, mod)
         self.ldb_user2.modify_ldif(ldif)
         res = self.ldb_admin.search(self.base_dn, expression="(distinguishedName=%s)"
-                                     % ("CN=test_modify_group2,CN=Users," + self.base_dn), attrs=["Member"])
+                                    % ("CN=test_modify_group2,CN=Users," + self.base_dn), attrs=["Member"])
         self.assertEqual(res[0]["Member"][0], self.get_user_dn(self.user_with_sm))
 # but not other users
         ldif = """
@@ -615,7 +615,7 @@ add: Member
 Member: """ + self.get_user_dn(self.user_with_wp)
         self.ldb_user.modify_ldif(ldif)
         res = self.ldb_admin.search(self.base_dn, expression="(distinguishedName=%s)"
-                                     % ("CN=test_modify_group2,CN=Users," + self.base_dn), attrs=["Member"])
+                                    % ("CN=test_modify_group2,CN=Users," + self.base_dn), attrs=["Member"])
         self.assertEqual(res[0]["Member"][0], self.get_user_dn(self.user_with_wp))
         ldif = """
 dn: CN=test_modify_group2,CN=Users,""" + self.base_dn + """
@@ -629,7 +629,7 @@ add: Member
 Member: CN=test_modify_user2,CN=Users,""" + self.base_dn
         self.ldb_user.modify_ldif(ldif)
         res = self.ldb_admin.search(self.base_dn, expression="(distinguishedName=%s)"
-                                     % ("CN=test_modify_group2,CN=Users," + self.base_dn), attrs=["Member"])
+                                    % ("CN=test_modify_group2,CN=Users," + self.base_dn), attrs=["Member"])
         self.assertEqual(res[0]["Member"][0], "CN=test_modify_user2,CN=Users," + self.base_dn)
 
     def test_modify_anonymous(self):
@@ -1977,10 +1977,10 @@ class AclSPNTests(AclTests):
         ctx.krbtgt_dn = "CN=krbtgt_%s,CN=Users,%s" % (ctx.myname, ctx.base_dn)
 
         ctx.never_reveal_sid = ["<SID=%s-%s>" % (ctx.domsid, security.DOMAIN_RID_RODC_DENY),
-                                 "<SID=%s>" % security.SID_BUILTIN_ADMINISTRATORS,
-                                 "<SID=%s>" % security.SID_BUILTIN_SERVER_OPERATORS,
-                                 "<SID=%s>" % security.SID_BUILTIN_BACKUP_OPERATORS,
-                                 "<SID=%s>" % security.SID_BUILTIN_ACCOUNT_OPERATORS]
+                                "<SID=%s>" % security.SID_BUILTIN_ADMINISTRATORS,
+                                "<SID=%s>" % security.SID_BUILTIN_SERVER_OPERATORS,
+                                "<SID=%s>" % security.SID_BUILTIN_BACKUP_OPERATORS,
+                                "<SID=%s>" % security.SID_BUILTIN_ACCOUNT_OPERATORS]
         ctx.reveal_sid = "<SID=%s-%s>" % (ctx.domsid, security.DOMAIN_RID_RODC_ALLOW)
 
         mysid = ctx.get_mysid()

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index dac8aa0fd679b4d063b3faca029dd45a0c30e56b..affc3b85a3bc29c822542a4a5f3800e0d91f182a 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2825,9 +2825,9 @@ objectClass: posixAccount""" % (self.base_dn))
         delete_force(self.ldb, user_dn)
         try:
             self.ldb.add({"dn": user_dn,
-                           "objectClass": "user",
-                           "sAMAccountName": user_name,
-                           "nTSecurityDescriptor": []})
+                          "objectClass": "user",
+                          "sAMAccountName": user_name,
+                          "nTSecurityDescriptor": []})
             self.fail()
         except LdbError as e107:
             (num, _) = e107.args
@@ -2906,8 +2906,8 @@ nTSecurityDescriptor:: """ + desc_base64)
         #
         delete_force(self.ldb, user_dn)
         self.ldb.add({"dn": user_dn,
-                       "objectClass": "user",
-                       "sAMAccountName": user_name})
+                      "objectClass": "user",
+                      "sAMAccountName": user_name})
 
         m = Message()
         m.dn = Dn(ldb, user_dn)
@@ -3124,8 +3124,8 @@ nTSecurityDescriptor:: """ + desc_base64
 
         delete_force(self.ldb, user_dn)
         self.ldb.add({"dn": user_dn,
-                       "objectClass": "user",
-                       "sAMAccountName": user_name})
+                      "objectClass": "user",
+                      "sAMAccountName": user_name})
 
         #
         # We check the following values:

diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index 716fd161895215eaa6ad12971d42cac4fcd7e27e..d2465f7ae0ed5fca72dc56eab0f886c568de8bd6 100755 (executable)
--- a/source4/dsdb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
@@ -1610,7 +1610,7 @@ class SchemaTests_msDS_isRODC(samba.tests.TestCase):
     def setUp(self):
         super(SchemaTests_msDS_isRODC, self).setUp()
         self.ldb = SamDB(host, credentials=creds,
-                          session_info=system_session(lp), lp=lp, options=ldb_options)
+                         session_info=system_session(lp), lp=lp, options=ldb_options)
         res = self.ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["defaultNamingContext"])
         self.assertEquals(len(res), 1)
         self.base_dn = res[0]["defaultNamingContext"][0]

diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py
index e4b3c583452f6a310946c994eec5050afd008a55..2a0c1ed6d600083bc12c8071fdb6dcd1d35090ef 100644 (file)
--- a/source4/dsdb/tests/python/rodc_rwdc.py
+++ b/source4/dsdb/tests/python/rodc_rwdc.py
@@ -86,7 +86,7 @@ def set_auto_replication(dc, allow):
             if 'LDAP_REFERRAL' not in stderr:
                 raise RodcRwdcTestException()
             print("ignoring +%s REFERRAL error; assuming %s is RODC" %
-                   (opt, dc))
+                  (opt, dc))
 
 
 def preload_rodc_user(user_dn):

diff --git a/source4/dsdb/tests/python/sort.py b/source4/dsdb/tests/python/sort.py
index b89a8c67dc0f96afb99a0b79f6bdf2534262dc11..f1247be9e1ffe9c90ad5513b5baee8e9bd877baa 100644 (file)
--- a/source4/dsdb/tests/python/sort.py
+++ b/source4/dsdb/tests/python/sort.py
@@ -333,7 +333,7 @@ class BaseSortTests(samba.tests.TestCase):
                     if result_attr == "msTSExpireDate4":
                         print('-' * 72)
                         print("This test fails against Windows with the "
-                               "default number of elements (33).")
+                              "default number of elements (33).")
                         print("Try with --elements=27 (or similar).")
                         print('-' * 72)
 

diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index a69699ed169cad467e25b60c1851d1683005d668..8df123f173b085e1200257512d1bf78a49d1cbca 100755 (executable)
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -72,8 +72,8 @@ class StaticTokenTest(samba.tests.TestCase):
         self.user_sid_dn = "<SID=%s>" % str(ndr_unpack(samba.dcerpc.security.dom_sid, res[0]["tokenGroups"][0]))
 
         session_info_flags = (AUTH_SESSION_INFO_DEFAULT_GROUPS |
-                               AUTH_SESSION_INFO_AUTHENTICATED |
-                               AUTH_SESSION_INFO_SIMPLE_PRIVILEGES)
+                              AUTH_SESSION_INFO_AUTHENTICATED |
+                              AUTH_SESSION_INFO_SIMPLE_PRIVILEGES)
         if creds.get_kerberos_state() == DONT_USE_KERBEROS:
             session_info_flags |= AUTH_SESSION_INFO_NTLM
 
@@ -284,8 +284,8 @@ class DynamicTokenTest(samba.tests.TestCase):
         self.test_user_dn = res[0].dn
 
         session_info_flags = (AUTH_SESSION_INFO_DEFAULT_GROUPS |
-                               AUTH_SESSION_INFO_AUTHENTICATED |
-                               AUTH_SESSION_INFO_SIMPLE_PRIVILEGES)
+                              AUTH_SESSION_INFO_AUTHENTICATED |
+                              AUTH_SESSION_INFO_SIMPLE_PRIVILEGES)
 
         if creds.get_kerberos_state() == DONT_USE_KERBEROS:
             session_info_flags |= AUTH_SESSION_INFO_NTLM

diff --git a/source4/dsdb/tests/python/vlv.py b/source4/dsdb/tests/python/vlv.py
index 7d96103bd9521f1623531fbf45e2eb0ac2f1621b..d1d5418cf57a3e9a53d7edcc9ab3b43aaf4a434b 100644 (file)
--- a/source4/dsdb/tests/python/vlv.py
+++ b/source4/dsdb/tests/python/vlv.py
@@ -559,7 +559,7 @@ class VLVTests(samba.tests.TestCase):
 
                         if expected_results != results:
                             print("attr %s before %d after %d offset %d" %
-                                   (attr, before, after, offset))
+                                  (attr, before, after, offset))
                         self.assertEquals(expected_results, results)
 
                         n = len(self.users)
@@ -702,10 +702,10 @@ class VLVTests(samba.tests.TestCase):
                                 if offset != 0:
                                     raise
                                 print("offset %d denominator %d raised error "
-                                       "expected error %s\n"
-                                       "(offset zero is illegal unless "
-                                       "content count is zero)" %
-                                       (offset, denominator, e))
+                                      "expected error %s\n"
+                                      "(offset zero is illegal unless "
+                                      "content count is zero)" %
+                                      (offset, denominator, e))
                                 continue
 
                             results = [x[attr][0].lower() for x in res]
@@ -741,7 +741,7 @@ class VLVTests(samba.tests.TestCase):
                                     if cstr.startswith('vlv_resp'):
                                         bits = cstr.rsplit(':')
                                         print("the answer is %s; we said %d" %
-                                               (bits[2], real_offset))
+                                              (bits[2], real_offset))
                                         break
 
     def test_server_vlv_no_cookie(self):
@@ -859,7 +859,7 @@ class VLVTests(samba.tests.TestCase):
                                                                      base=base,
                                                                      scope=ldb.SCOPE_ONELEVEL)
             print("searching for attr %s amongst %d deleted objects" %
-                   (attr, len(expected_order)))
+                  (attr, len(expected_order)))
             sort_control = "server_sort:1:0:%s" % attr
             step = max(len(expected_order) // 10, 1)
             for before in [3, 0]:
@@ -1008,8 +1008,8 @@ class VLVTests(samba.tests.TestCase):
                             print(expected_order)
                             print()
                             print("\nattr %s offset %d before %d "
-                                   "after %d gte %s" %
-                                   (attr, offset, before, after, gte))
+                                  "after %d gte %s" %
+                                  (attr, offset, before, after, gte))
                         self.assertEquals(expected_results, results)
 
     def test_multiple_searches(self):

diff --git a/source4/torture/drs/python/cracknames.py b/source4/torture/drs/python/cracknames.py
index c030de0b54c017cbe531b24e36a2bb86c5643d41..97c751f51805f6ce34431def2db9c461b664a161 100644 (file)
--- a/source4/torture/drs/python/cracknames.py
+++ b/source4/torture/drs/python/cracknames.py
@@ -125,7 +125,7 @@ class DrsCracknamesTestCase(drs_base.DrsBaseTestCase):
             "sAMAccountName": username,
             "userPrincipalName": "test2@test.com",
             "servicePrincipalName": ["test2/%s" % self.ldb_dc1.get_default_basedn(),
-                                      "test3/%s" % self.ldb_dc1.get_default_basedn()],
+                                     "test3/%s" % self.ldb_dc1.get_default_basedn()],
             "displayName": "test2"}
 
         self.ldb_dc1.add(user_record)

diff --git a/source4/torture/drs/python/repl_rodc.py b/source4/torture/drs/python/repl_rodc.py
index b9e3f827773dacc25b4caf88c662a12c44ef9eb9..727addb397aee66c602d5600ba3c097c23d8da38 100644 (file)
--- a/source4/torture/drs/python/repl_rodc.py
+++ b/source4/torture/drs/python/repl_rodc.py
@@ -666,10 +666,10 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase):
         ctx.krbtgt_dn = "CN=krbtgt_%s,CN=Users,%s" % (ctx.myname, ctx.base_dn)
 
         ctx.never_reveal_sid = ["<SID=%s-%s>" % (ctx.domsid, security.DOMAIN_RID_RODC_DENY),
-                                 "<SID=%s>" % security.SID_BUILTIN_ADMINISTRATORS,
-                                 "<SID=%s>" % security.SID_BUILTIN_SERVER_OPERATORS,
-                                 "<SID=%s>" % security.SID_BUILTIN_BACKUP_OPERATORS,
-                                 "<SID=%s>" % security.SID_BUILTIN_ACCOUNT_OPERATORS]
+                                "<SID=%s>" % security.SID_BUILTIN_ADMINISTRATORS,
+                                "<SID=%s>" % security.SID_BUILTIN_SERVER_OPERATORS,
+                                "<SID=%s>" % security.SID_BUILTIN_BACKUP_OPERATORS,
+                                "<SID=%s>" % security.SID_BUILTIN_ACCOUNT_OPERATORS]
         ctx.reveal_sid = "<SID=%s-%s>" % (ctx.domsid, security.DOMAIN_RID_RODC_ALLOW)
 
         mysid = ctx.get_mysid()

diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index db847a67818cc9e13324a00a3410ff07690fc31f..b42c84d829bc23f2e749aad6f556fe781c904513 100755 (executable)
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -221,37 +221,37 @@ def test_dcpromo(t, vm):
 
     t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME}.${LCREALM} -k yes",
                    ["INBOUND NEIGHBORS",
-                     "${BASEDN}",
-                     "Last attempt .* was successful",
-                     "CN=Configuration,${BASEDN}",
-                     "Last attempt .* was successful",
-                     "CN=Configuration,${BASEDN}",  # cope with either order
-                     "Last attempt .* was successful",
-                     "OUTBOUND NEIGHBORS",
-                     "${BASEDN}",
-                     "Last success",
-                     "CN=Configuration,${BASEDN}",
-                     "Last success",
-                     "CN=Configuration,${BASEDN}",
-                     "Last success"],
+                    "${BASEDN}",
+                    "Last attempt .* was successful",
+                    "CN=Configuration,${BASEDN}",
+                    "Last attempt .* was successful",
+                    "CN=Configuration,${BASEDN}",  # cope with either order
+                    "Last attempt .* was successful",
+                    "OUTBOUND NEIGHBORS",
+                    "${BASEDN}",
+                    "Last success",
+                    "CN=Configuration,${BASEDN}",
+                    "Last success",
+                    "CN=Configuration,${BASEDN}",
+                    "Last success"],
                    ordered=True,
                    regex=True)
 
     t.cmd_contains("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${LCREALM} -k yes",
                    ["INBOUND NEIGHBORS",
-                     "${BASEDN}",
-                     "Last attempt .* was successful",
-                     "CN=Configuration,${BASEDN}",
-                     "Last attempt .* was successful",
-                     "CN=Configuration,${BASEDN}",
-                     "Last attempt .* was successful",
-                     "OUTBOUND NEIGHBORS",
-                     "${BASEDN}",
-                     "Last success",
-                     "CN=Configuration,${BASEDN}",
-                     "Last success",
-                     "CN=Configuration,${BASEDN}",
-                     "Last success"],
+                    "${BASEDN}",
+                    "Last attempt .* was successful",
+                    "CN=Configuration,${BASEDN}",
+                    "Last attempt .* was successful",
+                    "CN=Configuration,${BASEDN}",
+                    "Last attempt .* was successful",
+                    "OUTBOUND NEIGHBORS",
+                    "${BASEDN}",
+                    "Last success",
+                    "CN=Configuration,${BASEDN}",
+                    "Last success",
+                    "CN=Configuration,${BASEDN}",
+                    "Last success"],
                    ordered=True,
                    regex=True)
 
@@ -382,13 +382,13 @@ def test_dcpromo_rodc(t, vm):
 
     t.cmd_contains("bin/samba-tool drs showrepl ${HOSTNAME}.${LCREALM}",
                    ["INBOUND NEIGHBORS",
-                     "OUTBOUND NEIGHBORS",
-                     "${BASEDN}",
-                     "Last attempt.*was successful",
-                     "CN=Configuration,${BASEDN}",
-                     "Last attempt.*was successful",
-                     "CN=Configuration,${BASEDN}",
-                     "Last attempt.*was successful"],
+                    "OUTBOUND NEIGHBORS",
+                    "${BASEDN}",
+                    "Last attempt.*was successful",
+                    "CN=Configuration,${BASEDN}",
+                    "Last attempt.*was successful",
+                    "CN=Configuration,${BASEDN}",
+                    "Last attempt.*was successful"],
                    ordered=True,
                    regex=True)
 
@@ -537,13 +537,13 @@ def test_join_as_rodc(t, vm):
 
     t.cmd_contains("bin/samba-tool drs showrepl ${WIN_HOSTNAME}.${WIN_REALM} -k yes",
                    ["INBOUND NEIGHBORS",
-                     "OUTBOUND NEIGHBORS",
-                     "${WIN_BASEDN}",
-                     "Last attempt .* was successful",
-                     "CN=Configuration,${WIN_BASEDN}",
-                     "Last attempt .* was successful",
-                     "CN=Configuration,${WIN_BASEDN}",
-                     "Last attempt .* was successful"],
+                    "OUTBOUND NEIGHBORS",
+                    "${WIN_BASEDN}",
+                    "Last attempt .* was successful",
+                    "CN=Configuration,${WIN_BASEDN}",
+                    "Last attempt .* was successful",
+                    "CN=Configuration,${WIN_BASEDN}",
+                    "Last attempt .* was successful"],
                    ordered=True,
                    regex=True)