From: Andreas Schneider Date: Wed, 24 Nov 2021 12:21:28 +0000 (+0100) Subject: s3:libsmb: Remove trailing white spaces from passchange.c X-Git-Tag: tdb-1.4.6~471 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1520d2058a9430cf370f6fefd07bbddf3fbfe0;p=thirdparty%2Fsamba.git s3:libsmb: Remove trailing white spaces from passchange.c Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher --- diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index f60e3079975..e62d49d085c 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. SMB client password change routine Copyright (C) Andrew Tridgell 1994-1998 @@ -79,7 +79,7 @@ NTSTATUS remote_password_change(const char *remote_machine, if (!NT_STATUS_IS_OK(result)) { if (asprintf(err_str, "machine %s rejected the negotiate " - "protocol. Error was : %s.\n", + "protocol. Error was : %s.\n", remote_machine, nt_errstr(result)) == -1) { *err_str = NULL; } @@ -87,7 +87,7 @@ NTSTATUS remote_password_change(const char *remote_machine, return result; } - /* Given things like SMB signing, restrict anonymous and the like, + /* Given things like SMB signing, restrict anonymous and the like, try an authenticated connection first */ result = cli_session_setup_creds(cli, creds); @@ -120,7 +120,7 @@ NTSTATUS remote_password_change(const char *remote_machine, if (!NT_STATUS_IS_OK(result)) { if (asprintf(err_str, "machine %s rejected the session " - "setup. Error was : %s.\n", + "setup. Error was : %s.\n", remote_machine, nt_errstr(result)) == -1) { *err_str = NULL; } @@ -196,7 +196,7 @@ NTSTATUS remote_password_change(const char *remote_machine, cli_shutdown(cli); return NT_STATUS_OK; - } else if (!(NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) + } else if (!(NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) || NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))) { /* it failed, but for reasons such as wrong password, too short etc ... */ @@ -227,7 +227,7 @@ NTSTATUS remote_password_change(const char *remote_machine, cli_shutdown(cli); return NT_STATUS_OK; } else { - if (!(NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) + if (!(NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) || NT_STATUS_EQUAL(result, NT_STATUS_UNSUCCESSFUL))) { /* it failed, but again it was due to things like new password too short */