[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2646-g2a3e2c9

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  2a3e2c9550acb1c55c0c55e4bfb0faaadad2f6fd (commit)
      from  c11cde5187c5f71f08700955bb45caee9d4e8059 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2a3e2c9550acb1c55c0c55e4bfb0faaadad2f6fd
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jun 24 16:42:30 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 4d25d31..66952ff 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