From 01b726dbe8b3f9c65a24aac0436352650cd9d3aa Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 6 Jun 2012 16:22:50 +1000 Subject: [PATCH] s3-libsmb: Fix error messages to correctly mention PLAINTEXT not LM Also make all the message say the same thing. Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Wed Jun 6 10:17:55 CEST 2012 on sn-devel-104 --- source3/libsmb/cliconnect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index df8c6fcd8d3..f46ce06e4c3 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -2062,7 +2062,7 @@ NTSTATUS cli_session_setup(struct cli_state *cli, if ((sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) == 0 && !lp_client_plaintext_auth() && (*pass)) { - DEBUG(1, ("Server requested LM password but 'client plaintext auth = no'" + DEBUG(1, ("Server requested PLAINTEXT password but 'client plaintext auth = no'" " or 'client ntlmv2 auth = yes'\n")); return NT_STATUS_ACCESS_DENIED; } @@ -2101,7 +2101,7 @@ NTSTATUS cli_session_setup(struct cli_state *cli, if ((sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) == 0) { if (!lp_client_plaintext_auth() && (*pass)) { - DEBUG(1, ("Server requested LM password but 'client plaintext auth = no'" + DEBUG(1, ("Server requested PLAINTEXT password but 'client plaintext auth = no'" " or 'client ntlmv2 auth = yes'\n")); return NT_STATUS_ACCESS_DENIED; } @@ -2294,9 +2294,9 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx, uint8_t *tmp_pass; if (!lp_client_plaintext_auth() && (*pass)) { - DEBUG(1, ("Server requested plaintext " + DEBUG(1, ("Server requested PLAINTEXT " "password but " - "'client lanman auth = no' or 'client ntlmv2 auth = yes'\n")); + "'client plaintext auth = no' or 'client ntlmv2 auth = yes'\n")); goto access_denied; } @@ -2872,8 +2872,8 @@ NTSTATUS cli_raw_tcon(struct cli_state *cli, NTSTATUS status; if (!lp_client_plaintext_auth() && (*pass)) { - DEBUG(1, ("Server requested plaintext password but 'client " - "plaintext auth' is disabled\n")); + DEBUG(1, ("Server requested PLAINTEXT password but 'client plaintext auth = no'" + " or 'client ntlmv2 auth = yes'\n")); return NT_STATUS_ACCESS_DENIED; } -- 2.11.4.GIT