From: Jeremy Allison <jra@samba.org>
Date: Tue, 5 Jun 2007 23:35:39 +0000 (+0000)
Subject: r23358: Fix from Justin Maggard <jmaggard@infrant.com> - ensure we don't
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ea5a6bd334e31201aa6f93f5c51e42924d36ebd;p=thirdparty%2Fsamba.git

r23358: Fix from Justin Maggard <jmaggard@infrant.com> - ensure we don't
expire a password if it's explicitly set as ACB_PWNOTREQ.
Jeremy.
---

diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 64556cabd34..b6364a6ca49 100644
--- a/source/auth/auth_sam.c
+++ b/source/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);