summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-02-23 21:10:16 +0000
committerAndrew Bartlett <abartlet@samba.org>2004-02-23 21:10:16 +0000
commit397665a27375ee12d2b2c51370473cbe7d2ae2a4 (patch)
tree3650dbe1523d8880b5fd41bf0426bad44dcbec76
parentfab1291e284a40a9af95228e4a77be991cbf0fe0 (diff)
downloadsamba-397665a27375ee12d2b2c51370473cbe7d2ae2a4.tar.gz
samba-397665a27375ee12d2b2c51370473cbe7d2ae2a4.tar.bz2
samba-397665a27375ee12d2b2c51370473cbe7d2ae2a4.zip
(merge from 3.0)
Found by Fabien Chevalier <fabien.chevalier@supelec.fr> and JustFillBug <mozbugbox@yahoo.com.au> on the Samba lists - a 'max password age' of zero should be considered as 'never expire'. For the timebeing we just set it like -1, but we might revisit this for closer-to-ms behaviour. Andrew Bartlett (This used to be commit 2003cdc65e1b9f6514d97334997fee5c49813bac)
-rw-r--r--source3/passdb/pdb_get_set.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c
index 3974115588..908588c898 100644
--- a/source3/passdb/pdb_get_set.c
+++ b/source3/passdb/pdb_get_set.c
@@ -1085,7 +1085,7 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass)
return False;
if (!account_policy_get(AP_MAX_PASSWORD_AGE, &expire)
- || (expire==(uint32)-1)) {
+ || (expire==(uint32)-1) || (expire == 0)) {
if (!pdb_set_pass_must_change_time (sampass, get_time_t_max(), PDB_CHANGED))
return False;
} else {