summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-06-05 23:35:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:09 -0500
commit55ac16ba74602bf96fa63265a1026f62f58c273c (patch)
tree880b2682d8abe2ffaec21a7c8055c8495c294ef2
parent51ea3a2d00b1f66f4a1b15fccc8de721785d5ebc (diff)
downloadsamba-55ac16ba74602bf96fa63265a1026f62f58c273c.tar.gz
samba-55ac16ba74602bf96fa63265a1026f62f58c273c.tar.bz2
samba-55ac16ba74602bf96fa63265a1026f62f58c273c.zip
r23358: Fix from Justin Maggard <jmaggard@infrant.com> - ensure we don't
expire a password if it's explicitly set as ACB_PWNOTREQ. Jeremy. (This used to be commit 2ea5a6bd334e31201aa6f93f5c51e42924d36ebd)
-rw-r--r--source3/auth/auth_sam.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index 64556cabd3..b6364a6ca4 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -163,7 +163,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
return NT_STATUS_ACCOUNT_EXPIRED;
}
- if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP)) {
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP) && !(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) {
time_t must_change_time = pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);