[PATCH] s4:pwsettings: Correct off by factor of 10 for ticks.
Andrew Kroeger
andrew at id10ts.net
Sun Sep 6 21:28:56 MDT 2009
The tick conversion math was off by a factor of 10 due to the incorrect usage of
the "e" notation. The expression "XeY" means "X * (10^Y)", so the correct
expression is 1e7 to get the correct adjustment for ticks.
---
source4/setup/pwsettings | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings
index 49bb551..f26bcf7 100755
--- a/source4/setup/pwsettings
+++ b/source4/setup/pwsettings
@@ -74,8 +74,8 @@ try:
pwd_hist_len = int(res[0]["pwdHistoryLength"][0])
min_pwd_len = int(res[0]["minPwdLength"][0])
# ticks -> days
- min_pwd_age = int(abs(int(res[0]["minPwdAge"][0])) / (10e7 * 60 * 60 * 24))
- max_pwd_age = int(abs(int(res[0]["maxPwdAge"][0])) / (10e7 * 60 * 60 * 24))
+ 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:
if args[0] == "show":
print "ERROR: Password informations missing in your AD domain object!"
@@ -153,7 +153,7 @@ elif args[0] == "set":
else:
min_pwd_age = int(opts.min_pwd_age)
# days -> ticks
- min_pwd_age = -int(min_pwd_age * (24 * 60 * 60 * 10e7))
+ min_pwd_age = -int(min_pwd_age * (24 * 60 * 60 * 1e7))
m = ldb.Message()
m.dn = ldb.Dn(samdb, domain_dn)
@@ -168,7 +168,7 @@ elif args[0] == "set":
else:
max_pwd_age = int(opts.max_pwd_age)
# days -> ticks
- max_pwd_age = -int(max_pwd_age * (24 * 60 * 60 * 10e7))
+ max_pwd_age = -int(max_pwd_age * (24 * 60 * 60 * 1e7))
m = ldb.Message()
m.dn = ldb.Dn(samdb, domain_dn)
--
1.6.0.6
--------------080802000303010903050301--
More information about the samba-technical
mailing list