Changeset 140 for branches/samba-3.0/source/auth/auth_sam.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/auth/auth_sam.c (modified) (1 diff)

branches/samba-3.0/source/auth/auth_sam.c

@@ -168 +168 @@
                 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;