The branch, v3-3-test has been updated
via 10da498a2349bf5944183adf5a9284eafa2b8b74 (commit)
from 9486e532da602da587769d4ff8a1a2825e541a30 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 10da498a2349bf5944183adf5a9284eafa2b8b74
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Tue Jun 24 16:37:15 2008 -0700
Fix bug #5555. Don't return NT_STATUS_PASSWORD_MUST_CHANGE error on machine
account logon.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/auth/auth_sam.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 5e393f7..50bf153 100644
--- a/source/auth/auth_sam.c
+++ b/source/auth/auth_sam.c
@@ -166,8 +166,9 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
time_t must_change_time =
pdb_get_pass_must_change_time(sampass);
time_t last_set_time = pdb_get_pass_last_set_time(sampass);
- /* check for immediate expiry "must change at next logon" */
- if (last_set_time == 0) {
+ /* check for immediate expiry "must change at next logon"
+ * for a user account. */
+ if (((acct_ctrl & (ACB_WSTRUST|ACB_SVRTRUST)) == 0) &&
(last_set_time == 0)) {
DEBUG(1,("sam_account_ok: Account for user '%s'
password must change!.\n", pdb_get_username(sampass)));
return NT_STATUS_PASSWORD_MUST_CHANGE;
}
--
Samba Shared Repository
