diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2018-08-22 18:26:09 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:32 +0200 |
| commit | 06320851424a8d1368565f63b3c12a5ea273a111 (patch) | |
| tree | 33cb9f041100ea94ee1d81d81072a5c0bc9324e5 /python/samba/upgrade.py | |
| parent | 944a4609c71493250e2fa27cdf9a665dd503da99 (diff) | |
| download | samba-06320851424a8d1368565f63b3c12a5ea273a111.tar.gz | |
PEP8: improve formatting around bit-wise OR ("|")
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python/samba/upgrade.py')
| -rw-r--r-- | python/samba/upgrade.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 7207835b95c..12555b7994e 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -570,7 +570,10 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, next_rid = entry['rid'] + 1 user = s3db.getsampwnam(username) - acct_type = (user.acct_ctrl & (samr.ACB_NORMAL |samr.ACB_WSTRUST |samr.ACB_SVRTRUST |samr.ACB_DOMTRUST)) + acct_type = (user.acct_ctrl & (samr.ACB_NORMAL | + samr.ACB_WSTRUST | + samr.ACB_SVRTRUST | + samr.ACB_DOMTRUST)) if acct_type == samr.ACB_SVRTRUST: logger.warn(" Demoting BDC account trust for %s, this DC must be elevated to an AD DC using 'samba-tool domain dcpromo'" % username[:-1]) user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_SVRTRUST) | samr.ACB_WSTRUST @@ -583,11 +586,11 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, logger.warn(" Skipping account %s that has ACB_WSTRUST (W) set but does not end in $. This account can not have worked, and is probably left over from a misconfiguration." % username) continue - elif acct_type == (samr.ACB_NORMAL |samr.ACB_WSTRUST) and username[-1] == '$': + elif acct_type == (samr.ACB_NORMAL | samr.ACB_WSTRUST) and username[-1] == '$': logger.warn(" Fixing account %s which had both ACB_NORMAL (U) and ACB_WSTRUST (W) set. Account will be marked as ACB_WSTRUST (W), i.e. as a domain member" % username) user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_NORMAL) - elif acct_type == (samr.ACB_NORMAL |samr.ACB_SVRTRUST) and username[-1] == '$': + elif acct_type == (samr.ACB_NORMAL | samr.ACB_SVRTRUST) and username[-1] == '$': logger.warn(" Fixing account %s which had both ACB_NORMAL (U) and ACB_SVRTRUST (S) set. Account will be marked as ACB_WSTRUST (S), i.e. as a domain member" % username) user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_NORMAL) |