diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2018-08-22 17:06:23 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:31 +0200 |
| commit | 333bc327c0256b505c5ee651968deba06a046036 (patch) | |
| tree | 3da070c38380bc7897d954361868014c535e6036 /python | |
| parent | 5d0dc38cfed6b1966d41201d93bc321fbf80f0f6 (diff) | |
| download | samba-333bc327c0256b505c5ee651968deba06a046036.tar.gz | |
PEP8: better formatting of (CONST1|CONST2)
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/join.py | 3 | ||||
| -rw-r--r-- | python/samba/netcmd/domain.py | 4 | ||||
| -rw-r--r-- | python/samba/netcmd/gpo.py | 9 | ||||
| -rw-r--r-- | python/samba/samdb.py | 3 |
4 files changed, 14 insertions, 5 deletions
diff --git a/python/samba/join.py b/python/samba/join.py index 44bad58c9f4..9cab604ec4a 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -326,7 +326,8 @@ class DCJoinContext(object): raise Exception("Could not find domain member account '%s' to promote to a DC, use 'samba-tool domain join' instead'" % ctx.samname) if "msDS-krbTgtLink" in res[0] or "serverReferenceBL" in res[0] or "rIDSetReferences" in res[0]: raise Exception("Account '%s' appears to be an active DC, use 'samba-tool domain join' if you must re-create this account" % ctx.samname) - if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0): + if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT | + samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0): raise Exception("Account %s is not a domain member or a bare NT4 BDC, use 'samba-tool domain join' instead'" % ctx.samname) ctx.promote_from_dn = res[0].dn diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 7bee4bb2eaa..f3a17eec6b8 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -902,7 +902,9 @@ class cmd_domain_demote(Command): olduac = uac - uac &= ~(UF_SERVER_TRUST_ACCOUNT |UF_TRUSTED_FOR_DELEGATION |UF_PARTIAL_SECRETS_ACCOUNT) + uac &= ~(UF_SERVER_TRUST_ACCOUNT | + UF_TRUSTED_FOR_DELEGATION | + UF_PARTIAL_SECRETS_ACCOUNT) uac |= UF_WORKSTATION_TRUST_ACCOUNT msg = ldb.Message() diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index c0394772656..d0b94ffacc1 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -144,7 +144,10 @@ def get_gpo_dn(samdb, gpo): def get_gpo_info(samdb, gpo=None, displayname=None, dn=None, - sd_flags=security.SECINFO_OWNER |security.SECINFO_GROUP |security.SECINFO_DACL |security.SECINFO_SACL): + sd_flags=(security.SECINFO_OWNER | + security.SECINFO_GROUP | + security.SECINFO_DACL | + security.SECINFO_SACL)): '''Get GPO information using gpo, displayname or dn''' policies_dn = samdb.get_default_basedn() @@ -472,7 +475,9 @@ class cmd_list(Command): continue try: - sd_flags = security.SECINFO_OWNER |security.SECINFO_GROUP |security.SECINFO_DACL + sd_flags = (security.SECINFO_OWNER | + security.SECINFO_GROUP | + security.SECINFO_DACL) gmsg = self.samdb.search(base=g['dn'], scope=ldb.SCOPE_BASE, attrs=['name', 'displayName', 'flags', 'nTSecurityDescriptor'], diff --git a/python/samba/samdb.py b/python/samba/samdb.py index e91cf6516e7..0b80c9c878e 100644 --- a/python/samba/samdb.py +++ b/python/samba/samdb.py @@ -395,7 +395,8 @@ member: %s "objectClass": "user"} if smartcard_required: - ldbmessage["userAccountControl"] = str(dsdb.UF_NORMAL_ACCOUNT |dsdb.UF_SMARTCARD_REQUIRED) + ldbmessage["userAccountControl"] = str(dsdb.UF_NORMAL_ACCOUNT | + dsdb.UF_SMARTCARD_REQUIRED) setpassword = False if surname is not None: |