summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2004-02-20 16:00:25 +0000
committerJim McDonough <jmcd@samba.org>2004-02-20 16:00:25 +0000
commit926419434086b8063358df7a2fe9e863fddf337f (patch)
treef960927ee9c01f73c2e43fc60149b8ed0fd60a0d /source3/passdb
parent4a7d90424fa75709a56f3810e6cf2bde1dc781f0 (diff)
downloadsamba-926419434086b8063358df7a2fe9e863fddf337f.tar.gz
samba-926419434086b8063358df7a2fe9e863fddf337f.tar.bz2
samba-926419434086b8063358df7a2fe9e863fddf337f.zip
handle both 0 and -1 as disabling reset count and lockout duration
(This used to be commit 84fe24e64ee405bb25878c1e5fdf50592eb75f73)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/passdb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 1f1b5bdae6..7c9376e045 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -2223,8 +2223,8 @@ BOOL pdb_update_bad_password_count(SAM_ACCOUNT *sampass, BOOL *updated)
}
/* First, check if there is a reset time to compare */
- if (!resettime) {
- DEBUG(9, ("Reset time = 0, can't reset bad pw count\n"));
+ if ((resettime == (uint32) -1) || (resettime == 0)) {
+ DEBUG(9, ("No reset time, can't reset bad pw count\n"));
return True;
}
@@ -2262,8 +2262,8 @@ BOOL pdb_update_autolock_flag(SAM_ACCOUNT *sampass, BOOL *updated)
}
/* First, check if there is a duration to compare */
- if (!duration) {
- DEBUG(9, ("Lockout duration = 0, can't reset autolock\n"));
+ if ((duration == (uint32) -1) || (duration == 0)) {
+ DEBUG(9, ("No reset duration, can't reset autolock\n"));
return True;
}