summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Kroeger <andrew@id10ts.net>2009-09-07 02:04:55 -0500
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-10 01:09:54 +0200
commit0206b1d6f979dab29c70ada10153578ce45b774a (patch)
treec7850eea80434f611075bf66a72c999892e44f9b /source4
parent5f6ebc34832d85319bda184955a9e56120340927 (diff)
downloadsamba-0206b1d6f979dab29c70ada10153578ce45b774a.tar.gz
samba-0206b1d6f979dab29c70ada10153578ce45b774a.tar.bz2
samba-0206b1d6f979dab29c70ada10153578ce45b774a.zip
s4:pwsettings: Don't assume a value for pwdProperties.
If we cannot retrieve the value, do not assume a particular value. The fact that we could not retrieve the value indicates a larger problem that we don't want to make worse bypossibly clearing bit fields in the pwdProperties attribute.
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/setup/pwsettings4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings
index 68ff305c1e..bc65d2c0fa 100755
--- a/source4/setup/pwsettings
+++ b/source4/setup/pwsettings
@@ -84,8 +84,8 @@ except:
print "So no settings can be displayed!"
sys.exit(1)
else:
- pwd_props = 0
- message("WARNING: Assuming previous password properties 0 (used for password complexity setting)")
+ print "ERROR: Could not retrieve password properties (used for password complexity setting)"
+ sys.exit(1)
if args[0] == "show":
message("Password informations for domain '" + domain_dn + "'")