[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-731-ge5bd328

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  e5bd32812dd1e864e51c2199fd90d71813517f68 (commit)
       via  7799e18994354b2705ee8c64ae8c75e062ace460 (commit)
      from  5b72828600fb057a7aeb5f1a6fb6c23c23f28cd8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit e5bd32812dd1e864e51c2199fd90d71813517f68
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 19 20:27:47 2007 +0100

    Fix a "no prototype" warning

commit 7799e18994354b2705ee8c64ae8c75e062ace460
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 19 20:24:33 2007 +0100

    Fix debug messages
    
    When warning that "client plaintext auth" is not enabled where the server
    requested them we should not talk about "client use plaintext auth"

-----------------------------------------------------------------------

Summary of changes:
 source/client/dnsbrowse.c  |    1 +
 source/libsmb/cliconnect.c |   17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/dnsbrowse.c b/source/client/dnsbrowse.c
index c4819ce..5e3a4de 100644
--- a/source/client/dnsbrowse.c
+++ b/source/client/dnsbrowse.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "client/client_proto.h"
 
 #ifdef WITH_DNSSD_SUPPORT
 
diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 52ff699..d370808 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -959,8 +959,8 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
 
 		if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) == 0 &&
 		    !lp_client_plaintext_auth() && (*pass)) {
-			DEBUG(1, ("Server requested plaintext password but 'client use plaintext auth'"
-				  " is disabled\n"));
+			DEBUG(1, ("Server requested plaintext password but "
+				  "'client plaintext auth' is disabled\n"));
 			return NT_STATUS_ACCESS_DENIED;
 		}
 
@@ -986,8 +986,8 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
 
 	if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) == 0) {
 		if (!lp_client_plaintext_auth() && (*pass)) {
-			DEBUG(1, ("Server requested plaintext password but 'client use plaintext auth'"
-				  " is disabled\n"));
+			DEBUG(1, ("Server requested plaintext password but "
+				  "'client plaintext auth' is disabled\n"));
 			return NT_STATUS_ACCESS_DENIED;
 		}
 		return cli_session_setup_plaintext(cli, user, pass, workgroup);
@@ -1086,8 +1086,9 @@ bool cli_send_tconX(struct cli_state *cli,
 	} else {
 		if((cli->sec_mode & (NEGOTIATE_SECURITY_USER_LEVEL|NEGOTIATE_SECURITY_CHALLENGE_RESPONSE)) == 0) {
 			if (!lp_client_plaintext_auth() && (*pass)) {
-				DEBUG(1, ("Server requested plaintext password but 'client use plaintext auth'"
-					  " is disabled\n"));
+				DEBUG(1, ("Server requested plaintext "
+					  "password but 'client plaintext "
+					  "auth' is disabled\n"));
 				return False;
 			}
 
@@ -1798,8 +1799,8 @@ NTSTATUS cli_raw_tcon(struct cli_state *cli,
 	char *p;
 
 	if (!lp_client_plaintext_auth() && (*pass)) {
-		DEBUG(1, ("Server requested plaintext password but 'client use plaintext auth'"
-			  " is disabled\n"));
+		DEBUG(1, ("Server requested plaintext password but 'client "
+			  "plaintext auth' is disabled\n"));
 		return NT_STATUS_ACCESS_DENIED;
 	}
 


-- 
Samba Shared Repository