diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-09-18 17:33:24 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-09-18 17:33:24 +0200 |
| commit | b15ef6d854f8c39f8424c2ee524f1aca6bf2906c (patch) | |
| tree | aac724fded38009f263cca19c1ac4bd6ecb95685 | |
| parent | 11a7842854c0be8c427a2dbf0a8fc3761cda6298 (diff) | |
| download | samba-b15ef6d854f8c39f8424c2ee524f1aca6bf2906c.tar.gz samba-b15ef6d854f8c39f8424c2ee524f1aca6bf2906c.tar.bz2 samba-b15ef6d854f8c39f8424c2ee524f1aca6bf2906c.zip | |
s4:pwsettings - Simplify the error handling a bit
| -rwxr-xr-x | source4/setup/pwsettings | 7 |
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 + "'") |