[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-63-g91b0fab

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  91b0fab36e06ce48cb30b481b425475dcaa072a5 (commit)
      from  907e394e636896a7c6939f667e122cae574cf7d4 (commit)

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


- Log -----------------------------------------------------------------
commit 91b0fab36e06ce48cb30b481b425475dcaa072a5
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jun 24 16:41:18 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 80e02c3..57e16d9 100644
--- a/source/auth/auth_sam.c
+++ b/source/auth/auth_sam.c
@@ -167,8 +167,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