summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-18 17:33:24 +0200
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-18 17:33:24 +0200
commitb15ef6d854f8c39f8424c2ee524f1aca6bf2906c (patch)
treeaac724fded38009f263cca19c1ac4bd6ecb95685 /source4/setup
parent11a7842854c0be8c427a2dbf0a8fc3761cda6298 (diff)
downloadsamba-b15ef6d854f8c39f8424c2ee524f1aca6bf2906c.tar.gz
samba-b15ef6d854f8c39f8424c2ee524f1aca6bf2906c.tar.bz2
samba-b15ef6d854f8c39f8424c2ee524f1aca6bf2906c.zip
s4:pwsettings - Simplify the error handling a bit
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/pwsettings7
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings
index cd9c07dfb5..fccd73fc41 100755
--- a/source4/setup/pwsettings
+++ b/source4/setup/pwsettings
@@ -79,13 +79,10 @@ try:
min_pwd_age = int(abs(int(res[0]["minPwdAge"][0])) / (1e7 * 60 * 60 * 24))
max_pwd_age = int(abs(int(res[0]["maxPwdAge"][0])) / (1e7 * 60 * 60 * 24))
except:
+ print "ERROR: Could not retrieve password properties!"
if args[0] == "show":
- print "ERROR: Password informations missing in your AD domain object!"
print "So no settings can be displayed!"
- sys.exit(1)
- else:
- print "ERROR: Could not retrieve password properties (used for password complexity setting)"
- sys.exit(1)
+ sys.exit(1)
if args[0] == "show":
message("Password informations for domain '" + domain_dn + "'")