From f8fc3f9158aa7560fb81ff450327db1fb7c69cc0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 6 Nov 2006 19:21:44 +0000 Subject: r19577: Fix from Nils Nordman for bug #4085. Thanks ! Jeremy. (This used to be commit 3b5ab8ab8296339ad0e62d8564d706b5a446dcf3) --- source3/libsmb/passchange.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index e400819743..5b4b0896c0 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -86,12 +86,13 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam if (!NT_STATUS_IS_OK(result)) { - /* Password must change is the only valid error condition here - * from where we can proceed, the rest like account locked out - * or logon failure will lead to errors later anyway */ + /* Password must change or Password expired are the only valid + * error conditions here from where we can proceed, the rest like + * account locked out or logon failure will lead to errors later + * anyway */ - if (!NT_STATUS_EQUAL(result, - NT_STATUS_PASSWORD_MUST_CHANGE)) { + if (!NT_STATUS_EQUAL(result, NT_STATUS_PASSWORD_MUST_CHANGE) && + !NT_STATUS_EQUAL(result, NT_STATUS_PASSWORD_EXPIRED)) { slprintf(err_str, err_str_len-1, "Could not " "connect to machine %s: %s\n", remote_machine, cli_errstr(cli)); -- cgit