sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s4-net: fixed pwsettings command

Browse Source 
Don't override user settings with current settings
This commit is contained in:
Andrew Tridgell 2009-12-31 16:52:15 +11:00
parent dbd7a62baa
commit 3239872bbc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/scripting/python/samba/netcmd/pwsettings.py
View File

@ -88,10 +88,10 @@ class cmd_pwsettings(Command):
try:
pwd_props = int(res[0]["pwdProperties"][0])
pwd_hist_len = int(res[0]["pwdHistoryLength"][0])
min_pwd_len = int(res[0]["minPwdLength"][0])
cur_min_pwd_len = int(res[0]["minPwdLength"][0])
# ticks -> days
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))
cur_min_pwd_age = int(abs(int(res[0]["minPwdAge"][0])) / (1e7 * 60 * 60 * 24))
cur_max_pwd_age = int(abs(int(res[0]["maxPwdAge"][0])) / (1e7 * 60 * 60 * 24))
except KeyError:
raise CommandError("Could not retrieve password properties!")
@ -103,9 +103,9 @@ class cmd_pwsettings(Command):
else:
self.message("Password complexity: off")
self.message("Password history length: %d" % pwd_hist_len)
self.message("Minimum password length: %d" % min_pwd_len)
self.message("Minimum password age (days): %d" % min_pwd_age)
self.message("Maximum password age (days): %d" % max_pwd_age)
self.message("Minimum password length: %d" % cur_min_pwd_len)
self.message("Minimum password age (days): %d" % cur_min_pwd_age)
self.message("Maximum password age (days): %d" % cur_max_pwd_age)
elif subcommand == "set":
msgs = []
m = ldb.Message()