summaryrefslogtreecommitdiff
path: root/source3/passdb/pdb_get_set.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-05-23 17:14:47 -0700
committerJeremy Allison <jra@samba.org>2011-05-24 20:14:35 +0200
commit309a8fd7c62e7008b1a4c4c77c3a9ea35ed4bb07 (patch)
tree293872e001f357c69e8453e7e19caa9336e5b392 /source3/passdb/pdb_get_set.c
parent53829fd4951fc1189d64ecef1c1f58d21f0fb38b (diff)
downloadsamba-309a8fd7c62e7008b1a4c4c77c3a9ea35ed4bb07.tar.gz
Fix bug #7054 - X account flag does not work when pwdlastset is 0.
Don't allow pass_last_set_time to be set to zero (which means "user must change password on next logon") if user object doesn't allow password change. Don't automatically allow user object password change if "user must change password on next logon" is set. Jim please check. Jeremy.
Diffstat (limited to 'source3/passdb/pdb_get_set.c')
-rw-r--r--source3/passdb/pdb_get_set.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c
index 6c1a2ab23d7..782c08fc1c3 100644
--- a/source3/passdb/pdb_get_set.c
+++ b/source3/passdb/pdb_get_set.c
@@ -123,8 +123,7 @@ time_t pdb_get_pass_must_change_time(const struct samu *sampass)
bool pdb_get_pass_can_change(const struct samu *sampass)
{
- if (sampass->pass_can_change_time == get_time_t_max() &&
- sampass->pass_last_set_time != 0)
+ if (sampass->pass_can_change_time == get_time_t_max())
return False;
return True;
}