summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-11-06 19:21:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:42 -0500
commitf8fc3f9158aa7560fb81ff450327db1fb7c69cc0 (patch)
treef5b5d860772811b5f2fe1c2f2e499e68e443c7b6 /source3
parent3dcb61adcb40d3026cb95f36c1bbd72b56554486 (diff)
downloadsamba-f8fc3f9158aa7560fb81ff450327db1fb7c69cc0.tar.gz
samba-f8fc3f9158aa7560fb81ff450327db1fb7c69cc0.tar.bz2
samba-f8fc3f9158aa7560fb81ff450327db1fb7c69cc0.zip
r19577: Fix from Nils Nordman for bug #4085. Thanks !
Jeremy. (This used to be commit 3b5ab8ab8296339ad0e62d8564d706b5a446dcf3)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/passchange.c11
1 files 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));