From 484ce0634b020853edf0c5432e08523884199b1e Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Mon, 30 Jul 2018 18:14:37 +1200 Subject: [PATCH] PEP8: fix E123: closing bracket does not match indentation of opening bracket's line Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- lib/tevent/tevent.py | 2 +- python/samba/common.py | 2 +- python/samba/getopt.py | 2 +- python/samba/join.py | 4 +- python/samba/kcc/kcc_utils.py | 2 +- python/samba/ms_schema.py | 6 +-- python/samba/netcmd/computer.py | 16 +++--- python/samba/netcmd/dbcheck.py | 4 +- python/samba/netcmd/delegation.py | 22 ++++----- python/samba/netcmd/dns.py | 2 +- python/samba/netcmd/domain.py | 44 ++++++++--------- python/samba/netcmd/drs.py | 10 ++-- python/samba/netcmd/dsacl.py | 6 +-- python/samba/netcmd/forest.py | 10 ++-- python/samba/netcmd/fsmo.py | 14 +++--- python/samba/netcmd/gpo.py | 28 +++++------ python/samba/netcmd/group.py | 12 ++--- python/samba/netcmd/ldapcmp.py | 4 +- python/samba/netcmd/main.py | 2 +- python/samba/netcmd/nettime.py | 4 +- python/samba/netcmd/ntacl.py | 18 +++---- python/samba/netcmd/ou.py | 16 +++--- python/samba/netcmd/processes.py | 2 +- python/samba/netcmd/pso.py | 32 ++++++------ python/samba/netcmd/rodc.py | 2 +- python/samba/netcmd/schema.py | 18 +++---- python/samba/netcmd/sites.py | 2 +- python/samba/netcmd/spn.py | 8 +-- python/samba/netcmd/testparm.py | 2 +- python/samba/netcmd/user.py | 54 ++++++++++----------- python/samba/provision/__init__.py | 36 +++++++------- python/samba/provision/backend.py | 2 +- python/samba/provision/sambadns.py | 16 +++--- python/samba/tests/get_opt.py | 2 +- python/samba/tests/provision.py | 2 +- python/samba/tests/py_credentials.py | 2 +- python/samba/tests/samba3sam.py | 2 +- python/samba/tests/samba_tool/computer.py | 4 +- python/samba/tests/samba_tool/group.py | 2 +- python/samba/tests/samba_tool/ou.py | 2 +- python/samba/tests/samba_tool/user.py | 2 +- python/samba/tests/source.py | 2 +- python/samba/tests/xattr.py | 2 +- script/autobuild.py | 4 +- selftest/selftesthelpers.py | 2 +- source3/selftest/tests.py | 2 +- source4/dsdb/tests/python/sam.py | 10 ++-- source4/torture/drs/python/delete_object.py | 2 +- source4/torture/drs/python/drs_base.py | 2 +- source4/torture/drs/python/getnc_exop.py | 16 +++--- source4/torture/drs/python/repl_move.py | 2 +- source4/torture/drs/python/repl_schema.py | 2 +- 52 files changed, 234 insertions(+), 234 deletions(-) diff --git a/lib/tevent/tevent.py b/lib/tevent/tevent.py index 70455046a9f..14aa27de5b8 100644 --- a/lib/tevent/tevent.py +++ b/lib/tevent/tevent.py @@ -25,4 +25,4 @@ from _tevent import ( backend_list, Context, Signal, - ) +) diff --git a/python/samba/common.py b/python/samba/common.py index 66003993730..10891e4ce7a 100644 --- a/python/samba/common.py +++ b/python/samba/common.py @@ -48,7 +48,7 @@ def confirm(msg, forced=False, allow_all=False): '': False, 'N': False, 'NO': False, - } + } prompt = '[y/N]' diff --git a/python/samba/getopt.py b/python/samba/getopt.py index 3c819aed61d..f670f3916be 100644 --- a/python/samba/getopt.py +++ b/python/samba/getopt.py @@ -26,7 +26,7 @@ from samba.credentials import ( AUTO_USE_KERBEROS, DONT_USE_KERBEROS, MUST_USE_KERBEROS, - ) +) import sys diff --git a/python/samba/join.py b/python/samba/join.py index 3b648f50090..5b32e2f2d01 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -1350,7 +1350,7 @@ class DCJoinContext(object): "trustAuthIncoming" : ndr_pack(outgoing), "trustAuthOutgoing" : ndr_pack(outgoing), "securityIdentifier" : ndr_pack(ctx.forestsid) - } + } ctx.local_samdb.add(rec) rec = { @@ -1359,7 +1359,7 @@ class DCJoinContext(object): "userAccountControl" : str(samba.dsdb.UF_INTERDOMAIN_TRUST_ACCOUNT), "clearTextPassword" : ctx.trustdom_pass.encode('utf-16-le'), "samAccountName" : "%s$" % ctx.forest_domain_name - } + } ctx.local_samdb.add(rec) diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py index 1457ea355e0..c58d5d23217 100644 --- a/python/samba/kcc/kcc_utils.py +++ b/python/samba/kcc/kcc_utils.py @@ -28,7 +28,7 @@ from samba.dcerpc import ( drsblobs, drsuapi, misc, - ) +) from samba.common import dsdb_Dn from samba.ndr import ndr_unpack, ndr_pack from collections import Counter diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py index e8363754281..06df7e3067c 100644 --- a/python/samba/ms_schema.py +++ b/python/samba/ms_schema.py @@ -47,7 +47,7 @@ bitFields["searchflags"] = { 'fEXTENDEDLINKTRACKING': 21, # XL 'fBASEONLY': 20, # BO 'fPARTITIONSECRET': 19, # SE - } +} # ADTS: 2.2.10 bitFields["systemflags"] = { @@ -64,12 +64,12 @@ bitFields["systemflags"] = { 'FLAG_CONFIG_ALLOW_MOVE': 2, # AM 'FLAG_CONFIG_ALLOW_RENAME': 1, # AR 'FLAG_DISALLOW_DELETE': 0 # DD - } +} # ADTS: 2.2.11 bitFields["schemaflagsex"] = { 'FLAG_ATTR_IS_CRITICAL': 31 - } +} # ADTS: 3.1.1.2.2.2 oMObjectClassBER = { diff --git a/python/samba/netcmd/computer.py b/python/samba/netcmd/computer.py index 7a913b4fb3f..a887cb0a197 100644 --- a/python/samba/netcmd/computer.py +++ b/python/samba/netcmd/computer.py @@ -39,14 +39,14 @@ from samba import ( Ldb, werror, WERRORError - ) +) from samba.netcmd import ( Command, CommandError, SuperCommand, Option, - ) +) def _is_valid_ip(ip_string, address_families=None): @@ -234,7 +234,7 @@ Example3 shows how to create a new computer in the OrgUnit organizational unit. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, computername, credopts=None, sambaopts=None, versionopts=None, H=None, computerou=None, description=None, prepare_oldjoin=False, @@ -351,7 +351,7 @@ sudo is used so a computer may run the command as root. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, computername, credopts=None, sambaopts=None, versionopts=None, H=None): @@ -408,13 +408,13 @@ class cmd_computer_list(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, sambaopts=None, credopts=None, versionopts=None, H=None): lp = sambaopts.get_loadparm() @@ -485,7 +485,7 @@ attribute. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, computername, credopts=None, sambaopts=None, versionopts=None, H=None, computer_attrs=None): @@ -536,7 +536,7 @@ class cmd_computer_move(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, computername, new_ou_dn, credopts=None, sambaopts=None, versionopts=None, H=None): diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py index 210d4a26a1d..bd4f60f6bec 100644 --- a/python/samba/netcmd/dbcheck.py +++ b/python/samba/netcmd/dbcheck.py @@ -24,7 +24,7 @@ from samba.netcmd import ( Command, CommandError, Option - ) +) from samba.dbchecker import dbcheck @@ -74,7 +74,7 @@ class cmd_dbcheck(Command): Option("--reset-well-known-acls", dest="reset_well_known_acls", default=False, action="store_true", help="reset ACLs on objects with well known default ACL values to the default"), Option("-H", "--URL", help="LDB URL for database or target server (defaults to local SAM database)", type=str, metavar="URL", dest="H"), - ] + ] def run(self, DN=None, H=None, verbose=False, fix=False, yes=False, cross_ncs=False, quiet=False, diff --git a/python/samba/netcmd/delegation.py b/python/samba/netcmd/delegation.py index 49e5957c2b7..5eb4bb01b3c 100644 --- a/python/samba/netcmd/delegation.py +++ b/python/samba/netcmd/delegation.py @@ -30,7 +30,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option - ) +) class cmd_delegation_show(Command): @@ -42,12 +42,12 @@ class cmd_delegation_show(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["accountname"] @@ -98,12 +98,12 @@ class cmd_delegation_for_any_service(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["accountname", "onoff"] @@ -151,12 +151,12 @@ class cmd_delegation_for_any_protocol(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["accountname", "onoff"] @@ -205,12 +205,12 @@ class cmd_delegation_add_service(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["accountname", "principal"] @@ -259,12 +259,12 @@ class cmd_delegation_del_service(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["accountname", "principal"] diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py index ab6bacc6050..5718fc5e97b 100644 --- a/python/samba/netcmd/dns.py +++ b/python/samba/netcmd/dns.py @@ -36,7 +36,7 @@ from samba.netcmd import ( CommandError, Option, SuperCommand, - ) +) from samba.dcerpc import dnsp, dnsserver from samba.dnsserver import ARecord, AAAARecord, PTRRecord, CNameRecord, NSRecord, MXRecord, SOARecord, SRVRecord, TXTRecord diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index c8aa92b3ee0..373dfc21d1e 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -59,7 +59,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option - ) +) from samba.netcmd.fsmo import get_fsmo_roleowner from samba.netcmd.common import netcmd_get_domain_infos_via_cldap from samba.samba3 import Samba3 @@ -84,14 +84,14 @@ from samba.dsdb import ( UF_SERVER_TRUST_ACCOUNT, UF_TRUSTED_FOR_DELEGATION, UF_PARTIAL_SECRETS_ACCOUNT - ) +) from samba.provision import ( provision, ProvisioningError, DEFAULT_MIN_PWD_LENGTH, setup_path - ) +) from samba.provision.common import ( FILL_FULL, @@ -169,11 +169,11 @@ else: "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("--principal", help="extract only this principal", type=str), - ] + ] takes_args = ["keytab"] @@ -189,13 +189,13 @@ class cmd_domain_info(Command): synopsis = "%prog [options]" takes_options = [ - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_args = ["address"] @@ -282,7 +282,7 @@ class cmd_domain_provision(Command): Option("--partitions-only", help="Configure Samba's partitions, but do not modify them (ie, join a BDC)", action="store_true"), Option("--use-rfc2307", action="store_true", help="Use AD to store posix attributes (default = no)"), - ] + ] openldap_options = [ Option("--ldapadminpass", type="string", metavar="PASSWORD", @@ -300,7 +300,7 @@ class cmd_domain_provision(Command): Option("--ldap-backend-forced-uri", type="string", metavar="LDAP-BACKEND-FORCED-URI", help="Force the LDAP backend connection to be to a particular URI. Use this ONLY for 'existing' backends, or when debugging the interaction with the LDAP backend and you need to intercept the LDA"), Option("--ldap-backend-nosync", help="Configure LDAP backend not to call fsync() (for performance in test environments)", action="store_true"), - ] + ] ntvfs_options = [ Option("--use-xattrs", type="choice", choices=["yes","no","auto"], @@ -659,7 +659,7 @@ class cmd_domain_join(Command): Option("--parent-domain", help="parent domain to create subdomain under", type=str), Option("--adminpass", type="string", metavar="PASSWORD", help="choose adminstrator password when joining as a subdomain (otherwise random)"), - ] + ] ntvfs_options = [ Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)", @@ -754,13 +754,13 @@ class cmd_domain_demote(Command): "to remove ALL references to (rather than this DC)", type=str), Option("-q", "--quiet", help="Be quiet", action="store_true"), Option("-v", "--verbose", help="Be verbose", action="store_true"), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, sambaopts=None, credopts=None, versionopts=None, server=None, @@ -1052,7 +1052,7 @@ class cmd_domain_level(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, @@ -1285,7 +1285,7 @@ class cmd_domain_passwordsettings_show(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, @@ -1359,7 +1359,7 @@ class cmd_domain_passwordsettings_set(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, @@ -2098,7 +2098,7 @@ class cmd_domain_trust_list(DomainTrustCommand): } takes_options = [ - ] + ] def run(self, sambaopts=None, versionopts=None, localdcopts=None): @@ -2143,7 +2143,7 @@ class cmd_domain_trust_show(DomainTrustCommand): } takes_options = [ - ] + ] takes_args = ["domain"] @@ -2286,7 +2286,7 @@ class cmd_domain_trust_create(DomainTrustCommand): help="Skip validation of the trust.", dest='validate', default=True), - ] + ] takes_args = ["domain"] @@ -2782,7 +2782,7 @@ class cmd_domain_trust_delete(DomainTrustCommand): help="Where to delete the trusted domain object: 'local' or 'both'.", dest='delete_location', default="both"), - ] + ] takes_args = ["domain"] @@ -2939,7 +2939,7 @@ class cmd_domain_trust_validate(DomainTrustCommand): help="Where to validate the trusted domain object: 'local' or 'both'.", dest='validate_location', default="both"), - ] + ] takes_args = ["domain"] @@ -3162,7 +3162,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): help="Delete an existing msDS-SPNSuffixes attribute of the local forest. Can be specified multiple times.", dest='delete_spn', default=[]), - ] + ] takes_args = ["domain?"] @@ -3853,7 +3853,7 @@ This command expunges tombstones from the database.""" "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, *ncs, **kwargs): sambaopts = kwargs.get("sambaopts") diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index 7ed0486c73a..5a17aa3d24a 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -30,7 +30,7 @@ from samba.netcmd import ( CommandError, Option, SuperCommand, - ) +) from samba.samdb import SamDB from samba import drs_utils, nttime2string, dsdb from samba.dcerpc import drsuapi, misc @@ -431,7 +431,7 @@ class cmd_drs_replicate(Command): Option("--local-online", help="pull changes into the local database (destination DC is ignored) as a normal online replication", action="store_true"), Option("--async-op", help="use ASYNC_OP for the replication", action="store_true"), Option("--single-object", help="Replicate only the object specified, instead of the whole Naming Context (only with --local)", action="store_true"), - ] + ] def drs_local_replicate(self, SOURCE_DC, NC, full_sync=False, single_object=False, @@ -639,7 +639,7 @@ class cmd_drs_bind(Command): ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10", "DRS_EXT_GETCHGREQ_V10"), ("DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2", "DRS_EXT_RESERVED_FOR_WIN2K_OR_DOTNET_PART2"), ("DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART3", "DRS_EXT_RESERVED_FOR_WIN2K_OR_DOTNET_PART3") - ] + ] optmap_ext = [ ("DRSUAPI_SUPPORTED_EXTENSION_ADAM", "DRS_EXT_ADAM"), @@ -689,7 +689,7 @@ class cmd_drs_options(Command): takes_options = [ Option("--dsa-option", help="DSA option to enable/disable", type="str", metavar="{+|-}IS_GC | {+|-}DISABLE_INBOUND_REPL | {+|-}DISABLE_OUTBOUND_REPL | {+|-}DISABLE_NTDSCONN_XLATE" ), - ] + ] option_map = {"IS_GC": 0x00000001, "DISABLE_INBOUND_REPL": 0x00000002, @@ -753,7 +753,7 @@ class cmd_drs_clone_dc_database(Command): Option("-q", "--quiet", help="Be quiet", action="store_true"), Option("--include-secrets", help="Also replicate secret values", action="store_true"), Option("-v", "--verbose", help="Be verbose", action="store_true") - ] + ] takes_args = ["domain"] diff --git a/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py index 28aa843adbc..d385b73dbeb 100644 --- a/python/samba/netcmd/dsacl.py +++ b/python/samba/netcmd/dsacl.py @@ -40,7 +40,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option, - ) +) @@ -54,7 +54,7 @@ class cmd_dsacl_set(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", @@ -81,7 +81,7 @@ class cmd_dsacl_set(Command): type="string"), Option("--sddl", help="An ACE or group of ACEs to be added on the object", type="string"), - ] + ] def find_trustee_sid(self, samdb, trusteedn): res = samdb.search(base=trusteedn, expression="(objectClass=*)", diff --git a/python/samba/netcmd/forest.py b/python/samba/netcmd/forest.py index 9b4f676b810..6c9f41e02b2 100644 --- a/python/samba/netcmd/forest.py +++ b/python/samba/netcmd/forest.py @@ -25,7 +25,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option - ) +) class cmd_forest_show(Command): """Display forest settings. @@ -41,12 +41,12 @@ class cmd_forest_show(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] def run(self, H=None, credopts=None, sambaopts=None, versionopts=None): lp = sambaopts.get_loadparm() @@ -89,12 +89,12 @@ class cmd_forest_set(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["value"] diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py index 91de5dad563..6d32a25cf9e 100644 --- a/python/samba/netcmd/fsmo.py +++ b/python/samba/netcmd/fsmo.py @@ -28,7 +28,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option, - ) +) from samba.samdb import SamDB def get_fsmo_roleowner(samdb, roledn, role): @@ -222,7 +222,7 @@ class cmd_fsmo_seize(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", @@ -242,7 +242,7 @@ domaindns=DomainDnsZonesMasterRole\n forestdns=ForestDnsZonesMasterRole\n all=all of the above\n You must provide an Admin user and password."""), - ] + ] takes_args = [] @@ -429,12 +429,12 @@ class cmd_fsmo_show(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = [] @@ -483,7 +483,7 @@ class cmd_fsmo_transfer(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", @@ -500,7 +500,7 @@ domaindns=DomainDnsZonesMasterRole\n forestdns=ForestDnsZonesMasterRole\n all=all of the above\n You must provide an Admin user and password."""), - ] + ] takes_args = [] diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 6d5e79ac36e..a63fc8f9722 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -32,7 +32,7 @@ from samba.netcmd import ( CommandError, Option, SuperCommand, - ) +) from samba.samdb import SamDB from samba import dsdb from samba.dcerpc import security @@ -381,7 +381,7 @@ class cmd_listall(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H") - ] + ] def run(self, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -419,7 +419,7 @@ class cmd_list(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H") - ] + ] def run(self, username, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -534,7 +534,7 @@ class cmd_show(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str) - ] + ] def run(self, gpo, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -582,7 +582,7 @@ class cmd_getlink(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str) - ] + ] def run(self, container_dn, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -633,7 +633,7 @@ class cmd_setlink(Command): help="Disable policy"), Option("--enforce", dest="enforced", default=False, action='store_true', help="Enforce policy") - ] + ] def run(self, container_dn, gpo, H=None, disabled=False, enforced=False, sambaopts=None, credopts=None, versionopts=None): @@ -719,7 +719,7 @@ class cmd_dellink(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str), - ] + ] def run(self, container, gpo, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -758,7 +758,7 @@ class cmd_listcontainers(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str) - ] + ] def run(self, gpo, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -794,7 +794,7 @@ class cmd_getinheritance(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str) - ] + ] def run(self, container_dn, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -838,7 +838,7 @@ class cmd_setinheritance(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str) - ] + ] def run(self, container_dn, inherit_state, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -893,7 +893,7 @@ class cmd_fetch(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str), Option("--tmpdir", help="Temporary directory for copying policy files", type=str) - ] + ] def run(self, gpo, H=None, tmpdir=None, sambaopts=None, credopts=None, versionopts=None): @@ -1119,7 +1119,7 @@ class cmd_create(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str), Option("--tmpdir", help="Temporary directory for copying policy files", type=str) - ] + ] def run(self, displayname, H=None, tmpdir=None, sambaopts=None, credopts=None, versionopts=None): @@ -1418,7 +1418,7 @@ class cmd_del(Command): takes_options = [ Option("-H", help="LDB URL for database or target server", type=str), - ] + ] def run(self, gpo, H=None, sambaopts=None, credopts=None, versionopts=None): @@ -1493,7 +1493,7 @@ class cmd_aclcheck(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H") - ] + ] def run(self, H=None, sambaopts=None, credopts=None, versionopts=None): diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py index 9e1e11071f4..6974bd78153 100644 --- a/python/samba/netcmd/group.py +++ b/python/samba/netcmd/group.py @@ -309,13 +309,13 @@ class cmd_group_list(Command): help="Verbose output, showing group type and group scope.", action="store_true"), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, sambaopts=None, credopts=None, versionopts=None, H=None, verbose=False): @@ -373,13 +373,13 @@ samba-tool group listmembers \"Domain Users\" -H ldap://samba.samdom.example.com takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_args = ["groupname"] @@ -464,7 +464,7 @@ class cmd_group_move(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, groupname, new_parent_dn, credopts=None, sambaopts=None, versionopts=None, H=None): @@ -549,7 +549,7 @@ Example3 shows how to display a users objectGUID and member attributes. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, groupname, credopts=None, sambaopts=None, versionopts=None, H=None, group_attrs=None): diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py index 800a16ad1b3..5945d97904b 100644 --- a/python/samba/netcmd/ldapcmp.py +++ b/python/samba/netcmd/ldapcmp.py @@ -35,7 +35,7 @@ from samba.netcmd import ( Command, CommandError, Option, - ) +) global summary summary = {} @@ -914,7 +914,7 @@ class cmd_ldapcmp(Command): help="List of comma separated attributes to ignore in the comparision"), Option("--skip-missing-dn", dest="skip_missing_dn", action="store_true", default=False, help="Skip report and failure due to missing DNs in one server or another"), - ] + ] def run(self, URL1, URL2, context1=None, context2=None, context3=None, context4=None, context5=None, diff --git a/python/samba/netcmd/main.py b/python/samba/netcmd/main.py index 83797662083..ae20940ab97 100644 --- a/python/samba/netcmd/main.py +++ b/python/samba/netcmd/main.py @@ -52,7 +52,7 @@ class cmd_sambatool(SuperCommand): takes_optiongroups = { "versionopts": options.VersionOptions, - } + } subcommands = cache_loader() diff --git a/python/samba/netcmd/nettime.py b/python/samba/netcmd/nettime.py index 694b6adda9b..b204d5e89ad 100644 --- a/python/samba/netcmd/nettime.py +++ b/python/samba/netcmd/nettime.py @@ -22,7 +22,7 @@ from samba.net import Net from samba.netcmd import ( Command, - ) +) class cmd_time(Command): """Retrieve the time on a server. @@ -45,7 +45,7 @@ Example2 return the date and time of the local server. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_args = ["server_name?"] diff --git a/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py index 5905db622c1..d2a232d8a63 100644 --- a/python/samba/netcmd/ntacl.py +++ b/python/samba/netcmd/ntacl.py @@ -35,7 +35,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option, - ) +) @@ -48,7 +48,7 @@ class cmd_ntacl_set(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("-q", "--quiet", help="Be quiet", action="store_true"), @@ -58,7 +58,7 @@ class cmd_ntacl_set(Command): Option("--use-ntvfs", help="Set the ACLs directly to the TDB or xattr for use with the ntvfs file server", action="store_true"), Option("--use-s3fs", help="Set the ACLs for use with the default s3fs file server via the VFS layer", action="store_true"), Option("--service", help="Name of the smb.conf service to use when applying the ACLs", type="string") - ] + ] takes_args = ["acl","file"] @@ -103,7 +103,7 @@ class cmd_dosinfo_get(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_args = ["file"] @@ -124,7 +124,7 @@ class cmd_ntacl_get(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("--as-sddl", help="Output ACL in the SDDL format", action="store_true"), @@ -134,7 +134,7 @@ class cmd_ntacl_get(Command): Option("--use-ntvfs", help="Get the ACLs directly from the TDB or xattr used with the ntvfs file server", action="store_true"), Option("--use-s3fs", help="Get the ACLs for use via the VFS layer used by the default s3fs file server", action="store_true"), Option("--service", help="Name of the smb.conf service to use when getting the ACLs", type="string") - ] + ] takes_args = ["file"] @@ -179,12 +179,12 @@ class cmd_ntacl_sysvolreset(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("--use-ntvfs", help="Set the ACLs for use with the ntvfs file server", action="store_true"), Option("--use-s3fs", help="Set the ACLs for use with the default s3fs file server", action="store_true") - ] + ] def run(self, use_ntvfs=False, use_s3fs=False, credopts=None, sambaopts=None, versionopts=None): @@ -246,7 +246,7 @@ class cmd_ntacl_sysvolcheck(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, credopts=None, sambaopts=None, versionopts=None): lp = sambaopts.get_loadparm() diff --git a/python/samba/netcmd/ou.py b/python/samba/netcmd/ou.py index 61717678cd4..ce9a1656506 100644 --- a/python/samba/netcmd/ou.py +++ b/python/samba/netcmd/ou.py @@ -25,7 +25,7 @@ from samba.netcmd import ( CommandError, Option, SuperCommand, - ) +) from samba.samdb import SamDB from samba import dsdb from operator import attrgetter @@ -58,7 +58,7 @@ class cmd_rename(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, old_ou_dn, new_ou_dn, credopts=None, sambaopts=None, versionopts=None, H=None): @@ -122,7 +122,7 @@ class cmd_move(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, old_ou_dn, new_parent_dn, credopts=None, sambaopts=None, versionopts=None, H=None): @@ -188,7 +188,7 @@ class cmd_create(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, ou_dn, credopts=None, sambaopts=None, versionopts=None, H=None, description=None): @@ -238,7 +238,7 @@ class cmd_listobjects(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, ou_dn, credopts=None, sambaopts=None, versionopts=None, H=None, full_dn=False, recursive=False): @@ -295,13 +295,13 @@ class cmd_list(Command): type=str, metavar="URL", dest="H"), Option("--full-dn", dest="full_dn", default=False, action='store_true', help="Display DNs including the base DN."), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, sambaopts=None, credopts=None, versionopts=None, H=None, full_dn=False): @@ -350,7 +350,7 @@ class cmd_delete(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, ou_dn, credopts=None, sambaopts=None, versionopts=None, H=None, force_subtree_delete=False): diff --git a/python/samba/netcmd/processes.py b/python/samba/netcmd/processes.py index c8000b7e49e..174142731c1 100644 --- a/python/samba/netcmd/processes.py +++ b/python/samba/netcmd/processes.py @@ -47,7 +47,7 @@ class cmd_processes(Command): help="Return only processes associated with one particular name"), Option("--pid", type=int, help="Return only names assoicated with one particular PID"), - ] + ] takes_args = [] diff --git a/python/samba/netcmd/pso.py b/python/samba/netcmd/pso.py index 96f0b4f259e..e68294f88df 100644 --- a/python/samba/netcmd/pso.py +++ b/python/samba/netcmd/pso.py @@ -318,12 +318,12 @@ class cmd_domain_pwdsettings_pso_create(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = pwd_settings_options + [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str) - ] + ] takes_args = ["psoname", "precedence"] def run(self, psoname, precedence, H=None, min_pwd_age=None, @@ -452,7 +452,7 @@ class cmd_domain_pwdsettings_pso_set(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = pwd_settings_options + [ Option("--precedence", type=int, @@ -460,7 +460,7 @@ class cmd_domain_pwdsettings_pso_set(Command): "Lower precedence is better ().")), Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["psoname"] def run(self, psoname, H=None, precedence=None, min_pwd_age=None, @@ -535,12 +535,12 @@ class cmd_domain_pwdsettings_pso_delete(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str) - ] + ] takes_args = ["psoname"] def run(self, psoname, H=None, credopts=None, sambaopts=None, @@ -575,12 +575,12 @@ class cmd_domain_pwdsettings_pso_list(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str) - ] + ] def run(self, H=None, credopts=None, sambaopts=None, versionopts=None): lp = sambaopts.get_loadparm() @@ -620,12 +620,12 @@ class cmd_domain_pwdsettings_pso_show(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str) - ] + ] takes_args = ["psoname"] def run(self, psoname, H=None, credopts=None, sambaopts=None, @@ -650,12 +650,12 @@ class cmd_domain_pwdsettings_pso_show_user(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str) - ] + ] takes_args = ["username"] def run(self, username, H=None, credopts=None, sambaopts=None, @@ -686,12 +686,12 @@ class cmd_domain_pwdsettings_pso_apply(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str) - ] + ] takes_args = ["psoname", "user_or_group"] def run(self, psoname, user_or_group, H=None, credopts=None, @@ -746,12 +746,12 @@ class cmd_domain_pwdsettings_pso_unapply(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", metavar="URL", dest="H", type=str), - ] + ] takes_args = ["psoname", "user_or_group"] def run(self, psoname, user_or_group, H=None, credopts=None, diff --git a/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py index 000858d5945..372c7efb81b 100644 --- a/python/samba/netcmd/rodc.py +++ b/python/samba/netcmd/rodc.py @@ -53,7 +53,7 @@ class cmd_rodc_preload(Command): Option("--server", help="DC to use", type=str), Option("--file", help="Read account list from a file, or - for stdin (one per line)", type=str), Option("--ignore-errors", help="When preloading multiple accounts, skip any failing accounts", action="store_true"), - ] + ] takes_args = ["account*"] diff --git a/python/samba/netcmd/schema.py b/python/samba/netcmd/schema.py index 9a356a43b8e..9b8df612216 100644 --- a/python/samba/netcmd/schema.py +++ b/python/samba/netcmd/schema.py @@ -26,7 +26,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option - ) +) class cmd_schema_attribute_modify(Command): """Modify attribute settings in the schema partition. @@ -75,13 +75,13 @@ class cmd_schema_attribute_modify(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("--searchflags", help="Search Flags for the attribute", type=str), Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["attribute"] @@ -140,12 +140,12 @@ class cmd_schema_attribute_show(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["attribute"] @@ -215,12 +215,12 @@ class cmd_schema_attribute_show_oc(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["attribute"] @@ -265,12 +265,12 @@ class cmd_schema_objectclass_show(Command): "sambaopts": options.SambaOptions, "versionopts": options.VersionOptions, "credopts": options.CredentialsOptions, - } + } takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_args = ["objectclass"] diff --git a/python/samba/netcmd/sites.py b/python/samba/netcmd/sites.py index aa4c86a9382..b86d7c0e167 100644 --- a/python/samba/netcmd/sites.py +++ b/python/samba/netcmd/sites.py @@ -26,7 +26,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option, - ) +) class cmd_sites_create(Command): diff --git a/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py index 001728cc651..b86780a3655 100644 --- a/python/samba/netcmd/spn.py +++ b/python/samba/netcmd/spn.py @@ -27,7 +27,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option - ) +) class cmd_spn_list(Command): @@ -39,7 +39,7 @@ class cmd_spn_list(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_args = ["user"] @@ -82,7 +82,7 @@ class cmd_spn_add(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_options = [ Option("--force", help="Force the addition of the spn" " even it exists already", action="store_true"), @@ -142,7 +142,7 @@ class cmd_spn_delete(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } takes_args = ["name", "user?"] diff --git a/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py index 2cd0897dfea..dc5a0b5346a 100644 --- a/python/samba/netcmd/testparm.py +++ b/python/samba/netcmd/testparm.py @@ -66,7 +66,7 @@ class cmd_testparm(Command): # These are harder to do with the new code structure Option("--show-all-parameters", action="store_true", default=False, help="Show the parameters, type, possible values") - ] + ] takes_args = [] diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index 9780f094931..92bb34e7c4a 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -45,7 +45,7 @@ from samba import ( gensec, generate_random_password, Ldb, - ) +) from samba.net import Net from samba.netcmd import ( @@ -53,7 +53,7 @@ from samba.netcmd import ( CommandError, SuperCommand, Option, - ) +) from samba.compat import text_type try: @@ -67,19 +67,19 @@ except ImportError as e: "python-gpgme required" disabled_virtual_attributes = { - } +} virtual_attributes = { "virtualClearTextUTF8": { "flags": ldb.ATTR_FLAG_FORCE_BASE64_LDIF, - }, + }, "virtualClearTextUTF16": { "flags": ldb.ATTR_FLAG_FORCE_BASE64_LDIF, - }, + }, "virtualSambaGPG": { "flags": ldb.ATTR_FLAG_FORCE_BASE64_LDIF, - }, - } + }, +} get_random_bytes_fn = None if get_random_bytes_fn is None: @@ -161,7 +161,7 @@ try: h = hashlib.sha1() h = None virtual_attributes["virtualSSHA"] = { - } + } except ImportError as e: reason = "hashlib.sha1()" if random_reason: @@ -169,7 +169,7 @@ except ImportError as e: reason += " required" disabled_virtual_attributes["virtualSSHA"] = { "reason" : reason, - } + } for (alg, attr) in [("5", "virtualCryptSHA256"), ("6", "virtualCryptSHA512")]: try: @@ -180,7 +180,7 @@ for (alg, attr) in [("5", "virtualCryptSHA256"), ("6", "virtualCryptSHA512")]: v = get_crypt_value(alg, "") v = None virtual_attributes[attr] = { - } + } except ImportError as e: reason = "crypt" if random_reason: @@ -188,12 +188,12 @@ for (alg, attr) in [("5", "virtualCryptSHA256"), ("6", "virtualCryptSHA512")]: reason += " required" disabled_virtual_attributes[attr] = { "reason" : reason, - } + } except NotImplementedError as e: reason = "modern '$%s$' salt in crypt(3) required" % (alg) disabled_virtual_attributes[attr] = { "reason" : reason, - } + } # Add the wDigest virtual attributes, virtualWDigest01 to virtualWDigest29 for x in range(1, 30): @@ -299,7 +299,7 @@ Example5 shows how to create an RFC2307/NIS domain enabled user account. If "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, username, password=None, credopts=None, sambaopts=None, versionopts=None, H=None, must_change_at_next_login=False, @@ -429,7 +429,7 @@ Example2 shows how to delete a user in the domain against the local server. su "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, username, credopts=None, sambaopts=None, versionopts=None, H=None): @@ -466,13 +466,13 @@ class cmd_user_list(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, sambaopts=None, credopts=None, versionopts=None, H=None): lp = sambaopts.get_loadparm() @@ -538,7 +538,7 @@ Example3 shows how to enable a user in the domain against a local LDAP server. Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), Option("--filter", help="LDAP Filter to set password on", type=str), - ] + ] takes_args = ["username?"] @@ -571,7 +571,7 @@ class cmd_user_disable(Command): Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), Option("--filter", help="LDAP Filter to set password on", type=str), - ] + ] takes_args = ["username?"] @@ -579,7 +579,7 @@ class cmd_user_disable(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, username=None, sambaopts=None, credopts=None, versionopts=None, filter=None, H=None): @@ -683,13 +683,13 @@ class cmd_user_password(Command): takes_options = [ Option("--newpassword", help="New password", type=str), - ] + ] takes_optiongroups = { "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, credopts=None, sambaopts=None, versionopts=None, newpassword=None): @@ -774,7 +774,7 @@ Example3 shows how an administrator would reset TestUser3 user's password to pas Option("--clear-smartcard-required", help="Don't require a smartcard for interactive logons", action="store_true"), - ] + ] takes_args = ["username?"] @@ -1428,7 +1428,7 @@ samba-tool user getpassword --filter=samaccountname=TestUser3 --attributes=msDS- Option("--decrypt-samba-gpg", help=decrypt_samba_gpg_help, action="store_true", default=False, dest="decrypt_samba_gpg"), - ] + ] takes_args = ["username?"] @@ -1688,7 +1688,7 @@ samba-tool user syncpasswords --terminate \\ Option("--terminate", help="Send a SIGTERM to an already running (daemon) process", action="store_true", default=False, dest="terminate"), - ] + ] def run(self, cache_ldb_initialize=False, cache_ldb=None, H=None, filter=None, @@ -2345,7 +2345,7 @@ LDAP server using the 'nano' editor. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, username, credopts=None, sambaopts=None, versionopts=None, H=None, editor=None): @@ -2477,7 +2477,7 @@ Example3 shows how to display a users objectSid and memberOf attributes. "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, username, credopts=None, sambaopts=None, versionopts=None, H=None, user_attrs=None): @@ -2549,7 +2549,7 @@ class cmd_user_move(Command): "sambaopts": options.SambaOptions, "credopts": options.CredentialsOptions, "versionopts": options.VersionOptions, - } + } def run(self, username, new_parent_dn, credopts=None, sambaopts=None, versionopts=None, H=None): diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index ca19b885d53..56e2c5f6c28 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -60,17 +60,17 @@ from samba import ( valid_netbios_name, version, is_heimdal_built, - ) +) from samba.dcerpc import security, misc from samba.dcerpc.misc import ( SEC_CHAN_BDC, SEC_CHAN_WKSTA, - ) +) from samba.dsdb import ( DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008_R2, ENC_ALL_TYPES, - ) +) from samba.idmap import IDmapDB from samba.ms_display_specifiers import read_ms_ldif from samba.ntacls import setntacl, getntacl, dsacl2fsacl @@ -80,7 +80,7 @@ from samba.provision.backend import ( FDSBackend, LDBBackend, OpenLDAPBackend, - ) +) from samba.descriptor import ( get_empty_descriptor, get_config_descriptor, @@ -102,7 +102,7 @@ from samba.descriptor import ( get_dns_forest_microsoft_dns_descriptor, get_dns_domain_microsoft_dns_descriptor, get_managed_service_accounts_descriptor, - ) +) from samba.provision.common import ( setup_path, setup_add_ldif, @@ -116,7 +116,7 @@ from samba.provision.sambadns import ( get_dnsadmins_sid, setup_ad_dns, create_dns_update_list - ) +) import samba.param import samba.registry @@ -731,7 +731,7 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir, "workgroup": domain, "realm": realm, "server role": serverrole, - } + } if lp is None: lp = samba.param.LoadParm() @@ -1028,14 +1028,14 @@ def setup_secretsdb(paths, session_info, backend_credentials, lp): setup_path("secrets_simple_ldap.ldif"), { "LDAPMANAGERDN": backend_credentials.get_bind_dn(), "LDAPMANAGERPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8') - }) + }) else: setup_add_ldif(secrets_ldb, setup_path("secrets_sasl_ldap.ldif"), { "LDAPADMINUSER": backend_credentials.get_username(), "LDAPADMINREALM": backend_credentials.get_realm(), "LDAPADMINPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8') - }) + }) except: secrets_ldb.transaction_cancel() raise @@ -1126,7 +1126,7 @@ def setup_samdb_rootdse(samdb, names): "ROOTDN" : names.rootdn, "CONFIGDN": names.configdn, "SERVERDN": names.serverdn, - }) + }) def setup_self_join(samdb, admin_session_info, names, fill, machinepass, @@ -1194,7 +1194,7 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass, "DEFAULTSITE": names.sitename, "NETBIOSNAME": names.netbiosname, "SERVERDN": names.serverdn, - }) + }) system_session_info = system_session() samdb.set_session_info(system_session_info) @@ -1392,7 +1392,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid, "DOMAIN_FUNCTIONALITY": str(domainFunctionality), "SAMBA_VERSION_STRING": version, "MIN_PWD_LENGTH": str(DEFAULT_MIN_PWD_LENGTH) - }) + }) # If we are setting up a subdomain, then this has been replicated in, so we don't need to add it if fill == FILL_FULL: @@ -1520,7 +1520,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid, "SYSTEM_DESCRIPTOR": system_desc, "BUILTIN_DESCRIPTOR": builtin_desc, "DOMAIN_CONTROLLERS_DESCRIPTOR": controllers_desc, - }) + }) # If we are setting up a subdomain, then this has been replicated in, so we don't need to add it if fill == FILL_FULL: @@ -1535,7 +1535,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid, setup_add_ldif(samdb, setup_path("provision_well_known_sec_princ.ldif"), { "CONFIGDN": names.configdn, "WELLKNOWNPRINCIPALS_DESCRIPTOR": protected1wd_descr, - }, controls=["relax:0", "provision:0"]) + }, controls=["relax:0", "provision:0"]) if fill == FILL_FULL or fill == FILL_SUBDOMAIN: setup_modify_ldif(samdb, @@ -1550,7 +1550,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid, "DOMAINSID": str(names.domainsid), "ADMINPASS_B64": b64encode(adminpass.encode('utf-16-le')).decode('utf8'), "KRBTGTPASS_B64": b64encode(krbtgtpass.encode('utf-16-le')).decode('utf8') - }, controls=["relax:0", "provision:0"]) + }, controls=["relax:0", "provision:0"]) logger.info("Setting up self join") setup_self_join(samdb, admin_session_info, names=names, fill=fill, @@ -2012,7 +2012,7 @@ _ROLES_MAP = { "member server": "member server", "standalone": "standalone server", "standalone server": "standalone server", - } +} def sanitize_server_role(role): @@ -2042,7 +2042,7 @@ def provision_fake_ypserver(logger, samdb, domaindn, netbiosname, nisdomain, "DOMAINDN": domaindn, "NETBIOSNAME": netbiosname, "NISDOMAIN": nisdomain, - }) + }) except: samdb.transaction_cancel() raise @@ -2447,7 +2447,7 @@ def create_krb5_conf(path, dnsdomain, hostname, realm): "DNSDOMAIN": dnsdomain, "HOSTNAME": hostname, "REALM": realm, - }) + }) class ProvisioningError(Exception): diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py index ea73f964b76..4813c279766 100644 --- a/python/samba/provision/backend.py +++ b/python/samba/provision/backend.py @@ -762,7 +762,7 @@ class FDSBackend(LDAPBackend): setup_file(setup_path("fedorads-samba.ldif"), self.samba_ldif, { "SAMBADN": self.sambadn, "LDAPADMINPASS": self.ldapadminpass - }) + }) mapping = "schema-map-fedora-ds-1.0" backend_schema = "99_ad.ldif" diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 740eac2a7a0..99dff9c9ba1 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -39,7 +39,7 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2008_R2, DS_DOMAIN_FUNCTION_2012_R2, DS_DOMAIN_FUNCTION_2016 - ) +) from samba.descriptor import ( get_domain_descriptor, get_domain_delete_protected1_descriptor, @@ -47,7 +47,7 @@ from samba.descriptor import ( get_dns_partition_descriptor, get_dns_forest_microsoft_dns_descriptor, get_dns_domain_microsoft_dns_descriptor - ) +) from samba.provision.common import ( setup_path, setup_add_ldif, @@ -57,7 +57,7 @@ from samba.provision.common import ( FILL_SUBDOMAIN, FILL_NT4SYNC, FILL_DRS, - ) +) from samba.samdb import get_default_backend_store @@ -248,7 +248,7 @@ def setup_dns_partitions(samdb, domainsid, domaindn, forestdn, configdn, setup_add_ldif(samdb, setup_path("provision_dnszones_partitions.ldif"), { "ZONE_DN": domainzone_dn, "SECDESC" : b64encode(descriptor).decode('utf8') - }) + }) if fill_level != FILL_SUBDOMAIN: setup_add_ldif(samdb, setup_path("provision_dnszones_partitions.ldif"), { "ZONE_DN": forestzone_dn, @@ -269,7 +269,7 @@ def setup_dns_partitions(samdb, domainsid, domaindn, forestdn, configdn, "SERVERDN": serverdn, "LOSTANDFOUND_DESCRIPTOR": b64encode(protected2_desc).decode('utf8'), "INFRASTRUCTURE_DESCRIPTOR": b64encode(protected1_desc).decode('utf8'), - }) + }) setup_modify_ldif(samdb, setup_path("provision_dnszones_modify.ldif"), { "CONFIGDN": configdn, "SERVERDN": serverdn, @@ -300,7 +300,7 @@ def setup_dns_partitions(samdb, domainsid, domaindn, forestdn, configdn, def add_dns_accounts(samdb, domaindn): setup_add_ldif(samdb, setup_path("provision_dns_accounts_add.ldif"), { "DOMAINDN": domaindn, - }) + }) def add_dns_container(samdb, domaindn, prefix, domain_sid, dnsadmins_sid, forest=False): @@ -763,7 +763,7 @@ def create_zone_file(lp, logger, paths, targetdir, dnsdomain, "HOSTIP6_HOST_LINE": hostip6_host_line, "GC_MSDCS_IP_LINE": gc_msdcs_ip_line, "GC_MSDCS_IP6_LINE": gc_msdcs_ip6_line, - }) + }) if paths.bind_gid is not None: try: @@ -997,7 +997,7 @@ def create_named_txt(path, realm, dnsdomain, dnsname, binddns_dir, "DNS_KEYTAB": keytab_name, "DNS_KEYTAB_ABS": os.path.join(binddns_dir, keytab_name), "PRIVATE_DIR": binddns_dir - }) + }) def is_valid_dns_backend(dns_backend): diff --git a/python/samba/tests/get_opt.py b/python/samba/tests/get_opt.py index 14ee0a7428b..b272a423147 100644 --- a/python/samba/tests/get_opt.py +++ b/python/samba/tests/get_opt.py @@ -25,7 +25,7 @@ from samba.getopt import ( DONT_USE_KERBEROS, MUST_USE_KERBEROS, parse_kerberos_arg, - ) +) import samba.tests class KerberosOptionTests(samba.tests.TestCase): diff --git a/python/samba/tests/provision.py b/python/samba/tests/provision.py index eb6deb5755f..b7d8369e58e 100644 --- a/python/samba/tests/provision.py +++ b/python/samba/tests/provision.py @@ -26,7 +26,7 @@ from samba.provision import ( sanitize_server_role, setup_secretsdb, findnss, - ) +) import samba.tests from samba.tests import env_loadparm, TestCase diff --git a/python/samba/tests/py_credentials.py b/python/samba/tests/py_credentials.py index c29afd1cf70..5737d89c948 100644 --- a/python/samba/tests/py_credentials.py +++ b/python/samba/tests/py_credentials.py @@ -30,7 +30,7 @@ from samba.dcerpc.netlogon import ( netr_Authenticator, netr_WorkstationInformation, MSV1_0_ALLOW_MSVCHAPV2 - ) +) from samba.dcerpc.misc import SEC_CHAN_WKSTA from samba.dsdb import ( UF_WORKSTATION_TRUST_ACCOUNT, diff --git a/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py index 2fb4f13cfa6..24a213779e9 100644 --- a/python/samba/tests/samba3sam.py +++ b/python/samba/tests/samba3sam.py @@ -325,7 +325,7 @@ class MapTestCase(MapBaseTestCase): "sambaSID": "S-1-5-21-4231626423-2410014848-2360679739", "sambaNextRid": "2000", "sambaDomainName": "TESTS" - }) + }) # Add a set of split records self.ldb.add_ldif(""" diff --git a/python/samba/tests/samba_tool/computer.py b/python/samba/tests/samba_tool/computer.py index 4036d973c12..dedcb90ca56 100644 --- a/python/samba/tests/samba_tool/computer.py +++ b/python/samba/tests/samba_tool/computer.py @@ -239,7 +239,7 @@ class ComputerCmdTestCase(SambaToolCmdTest): computer = { "name": self.randomName(), "description": self.randomName(count=100), - } + } computer.update(base) return computer @@ -250,7 +250,7 @@ class ComputerCmdTestCase(SambaToolCmdTest): ou = { "name": self.randomName(), "description": self.randomName(count=100), - } + } ou.update(base) return ou diff --git a/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py index 06226717ab1..23e910485cf 100644 --- a/python/samba/tests/samba_tool/group.py +++ b/python/samba/tests/samba_tool/group.py @@ -185,7 +185,7 @@ class GroupCmdTestCase(SambaToolCmdTest): group = { "name": self.randomName(), "description": self.randomName(count=100), - } + } group.update(base) return group diff --git a/python/samba/tests/samba_tool/ou.py b/python/samba/tests/samba_tool/ou.py index 35a474ea076..48ae5504566 100644 --- a/python/samba/tests/samba_tool/ou.py +++ b/python/samba/tests/samba_tool/ou.py @@ -251,7 +251,7 @@ class OUCmdTestCase(SambaToolCmdTest): ou = { "name": self.randomName(), "description": self.randomName(count=100), - } + } ou.update(base) return ou diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py index 9b9b96a08ea..3d0bc6d759c 100644 --- a/python/samba/tests/samba_tool/user.py +++ b/python/samba/tests/samba_tool/user.py @@ -512,7 +512,7 @@ sAMAccountName: %s "description": self.randomName(count=100), "createUserFn": self._create_user, "checkUserFn": self._check_user, - } + } user.update(base) return user diff --git a/python/samba/tests/source.py b/python/samba/tests/source.py index 0e0bd5c37cf..db4960ba7cb 100644 --- a/python/samba/tests/source.py +++ b/python/samba/tests/source.py @@ -27,7 +27,7 @@ import warnings from samba.tests import ( TestCase, - ) +) def get_python_source_files(): diff --git a/python/samba/tests/xattr.py b/python/samba/tests/xattr.py index 8e6178bed75..c99ffcf0087 100644 --- a/python/samba/tests/xattr.py +++ b/python/samba/tests/xattr.py @@ -25,7 +25,7 @@ from samba.tests import ( SkipTest, TestCase, TestCaseInTempDir, - ) +) import random import shutil import os diff --git a/script/autobuild.py b/script/autobuild.py index 752d04f2225..06f191cd50d 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -48,7 +48,7 @@ builddirs = { "pass" : ".", "fail" : ".", "retry" : "." - } +} defaulttasks = [ "ctdb", "samba", @@ -490,7 +490,7 @@ class buildlist(object): rebase_remote, rebase_branch, rebase_remote, rebase_remote, rebase_branch - ), + ), "test/plain" ) ] self.retry = builder('retry', retry_task, cp=False) diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py index 0d8014c7d13..2d6e2b12053 100644 --- a/selftest/selftesthelpers.py +++ b/selftest/selftesthelpers.py @@ -167,7 +167,7 @@ smbtorture4_options = [ "--maximum-runtime=$SELFTEST_MAXTIME", "--basedir=$SELFTEST_TMPDIR", "--format=subunit" - ] + get_env_torture_options() +] + get_env_torture_options() def plansmbtorture4testsuite(name, env, options, target, modname=None): diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 843dbec7392..0071e0b608d 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -25,7 +25,7 @@ from selftesthelpers import * smbtorture4_options.extend([ '--option=torture:sharedelay=100000', '--option=torture:writetimeupdatedelay=500000', - ]) +]) def plansmbtorture4testsuite(name, env, options, description=''): if description == '': diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py index e2d7b40ebae..efbe6fd05a7 100755 --- a/source4/dsdb/tests/python/sam.py +++ b/source4/dsdb/tests/python/sam.py @@ -1731,7 +1731,7 @@ class SamTests(samba.tests.TestCase): "sAMAccountName": username, "userAccountControl": str(UF_NORMAL_ACCOUNT), "unicodePwd": utf16pw, - }) + }) res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, scope=SCOPE_BASE, @@ -2553,7 +2553,7 @@ class SamTests(samba.tests.TestCase): "objectclass": "user", "userAccountControl": str(UF_NORMAL_ACCOUNT), "unicodePwd": "\"thatsAcomplPASS2\"".encode('utf-16-le') - }) + }) res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, scope=SCOPE_BASE, @@ -2656,7 +2656,7 @@ class SamTests(samba.tests.TestCase): "dn": "cn=ldaptestuser,cn=users," + self.base_dn, "objectclass": "user", "userAccountControl": str(UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE), - }) + }) res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, scope=SCOPE_BASE, @@ -2804,7 +2804,7 @@ class SamTests(samba.tests.TestCase): "dn": "cn=ldaptestuser,cn=users," + self.base_dn, "objectclass": "user", "userAccountControl": str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED|UF_ACCOUNTDISABLE), - }) + }) res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, scope=SCOPE_BASE, @@ -3678,7 +3678,7 @@ class SamTests(samba.tests.TestCase): ["CN=Enterprise Admins","CN=Users,"], ["CN=Administrator","CN=Users,"], ["CN=Domain Controllers","CN=Users,"], - ] + ] diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py index d37e7044384..4ee24c915fd 100644 --- a/source4/torture/drs/python/delete_object.py +++ b/source4/torture/drs/python/delete_object.py @@ -32,7 +32,7 @@ import time from ldb import ( SCOPE_SUBTREE, - ) +) import drs_base, ldb diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py index 06300f57b0e..bee5a8248a6 100644 --- a/source4/torture/drs/python/drs_base.py +++ b/source4/torture/drs/python/drs_base.py @@ -38,7 +38,7 @@ from ldb import ( SCOPE_BASE, Message, FLAG_MOD_REPLACE, - ) +) from samba.compat import cmp_fn class DrsBaseTestCase(SambaToolCmdTest): diff --git a/source4/torture/drs/python/getnc_exop.py b/source4/torture/drs/python/getnc_exop.py index db71748c4c8..e06ac30a5a9 100644 --- a/source4/torture/drs/python/getnc_exop.py +++ b/source4/torture/drs/python/getnc_exop.py @@ -149,20 +149,20 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): self.ldb_dc1.add({ "dn": ou1, "objectclass": "organizationalUnit" - }) + }) ou1_id = self._get_identifier(self.ldb_dc1, ou1) ou2 = "OU=get_anc2,%s" % ou1 self.ldb_dc1.add({ "dn": ou2, "objectclass": "organizationalUnit" - }) + }) ou2_id = self._get_identifier(self.ldb_dc1, ou2) dc3 = "CN=test_anc_dc_%u,%s" % (random.randint(0, 4294967295), ou2) self.ldb_dc1.add({ "dn": dc3, "objectclass": "computer", "userAccountControl": "%d" % (samba.dsdb.UF_ACCOUNTDISABLE | samba.dsdb.UF_SERVER_TRUST_ACCOUNT) - }) + }) dc3_id = self._get_identifier(self.ldb_dc1, dc3) # Add some linked attributes (for checking GET_TGT behaviour) @@ -226,7 +226,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): self.ldb_dc1.add({ "dn": non_nc_ou, "objectclass": "organizationalUnit" - }) + }) req8 = self._exop_req8(dest_dsa=None, invocation_id=self.ldb_dc1.get_invocation_id(), nc_dn_str=non_nc_ou, @@ -247,20 +247,20 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): self.ldb_dc1.add({ "dn": ou1, "objectclass": "organizationalUnit" - }) + }) ou1_id = self._get_identifier(self.ldb_dc1, ou1) ou2 = "OU=get_anc2,%s" % ou1 self.ldb_dc1.add({ "dn": ou2, "objectclass": "organizationalUnit" - }) + }) ou2_id = self._get_identifier(self.ldb_dc1, ou2) dc3 = "CN=test_anc_dc_%u,%s" % (random.randint(0, 4294967295), ou2) self.ldb_dc1.add({ "dn": dc3, "objectclass": "computer", "userAccountControl": "%d" % (samba.dsdb.UF_ACCOUNTDISABLE | samba.dsdb.UF_SERVER_TRUST_ACCOUNT) - }) + }) dc3_id = self._get_identifier(self.ldb_dc1, dc3) (hwm1, utdv1) = self._check_replication([ou1,ou2,dc3], @@ -371,7 +371,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): self.ldb_dc1.add({ "dn": cn3, "objectclass": "container", - }) + }) cn3_id = self._get_identifier(self.ldb_dc1, cn3) (hwm5, utdv5) = self._check_replication([dc3,ou1,ou2,self.ou,cn3], diff --git a/source4/torture/drs/python/repl_move.py b/source4/torture/drs/python/repl_move.py index b53b0c0b1c5..74ba6789ce3 100644 --- a/source4/torture/drs/python/repl_move.py +++ b/source4/torture/drs/python/repl_move.py @@ -40,7 +40,7 @@ from samba.drs_utils import drs_DsBind from ldb import ( SCOPE_BASE, SCOPE_SUBTREE, - ) +) import drs_base, ldb from samba.dcerpc.drsuapi import * diff --git a/source4/torture/drs/python/repl_schema.py b/source4/torture/drs/python/repl_schema.py index ed3ad094fec..6a668c85693 100644 --- a/source4/torture/drs/python/repl_schema.py +++ b/source4/torture/drs/python/repl_schema.py @@ -39,7 +39,7 @@ from ldb import ( Message, FLAG_MOD_ADD, FLAG_MOD_REPLACE - ) +) from samba.dcerpc import drsuapi, misc from samba.drs_utils import drs_DsBind from samba import dsdb -- 2.34.1