Attachment 4877 Details for Bug 6829 – git-am format patch for 3.4.3.

[patch] git-am format patch for 3.4.3.

0001-Fix-bug-6829-smbclient-does-not-show-special-chara.patch (text/plain), 2.08 KB, created by Jeremy Allison on 2009-10-22 17:33:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-10-22 17:33:41 UTC

Size: 2.08 KB

patch

obsolete

>From 6c6642a1016188ef29e8c8c93402609a5e350375 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Thu, 22 Oct 2009 15:30:47 -0700
>Subject: [PATCH] Fix bug 6829 - smbclient does not show special characters properly.
> All successful calls to cli_session_setup() *must* be followed by
> calls to cli_init_creds() to stash the credentials we successfully
> connected with. There were 2 codepaths where this was missing. This
> caused smbclient to be unable to open the \srvsvc pipe to do an RPC
> netserverenum, and cause it to fall back to a RAP netserverenum,
> which uses DOS codepage conversion rather than the full UCS2 of
> RPC, so the returned characters were not correct (unless the DOS
> codepage was set correctly). Phew. That was fun to track down :-).
> Includes logic simplification in libsmb_server.c
> Jeremy.
>
>---
> source3/libsmb/clidfs.c        |    9 +++++++++
> source3/libsmb/libsmb_server.c |    8 ++++++++
> 2 files changed, 17 insertions(+), 0 deletions(-)
>
>diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
>index 5e944f1..53dc6d7 100644
>--- a/source3/libsmb/clidfs.c
>+++ b/source3/libsmb/clidfs.c
>@@ -216,6 +216,15 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
> 			return NULL;
> 		}
> 		d_printf("Anonymous login successful\n");
>+		status = cli_init_creds(c, "", lp_workgroup(), "");
>+	} else {
>+		status = cli_init_creds(c, username, lp_workgroup(), password);
>+	}
>+
>+	if (!NT_STATUS_IS_OK(status)) {
>+		DEBUG(10,("cli_init_creds() failed: %s\n", nt_errstr(status)));
>+		cli_shutdown(c);
>+		return NULL;
> 	}
> 
> 	if ( show_sessetup ) {
>diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
>index 60849c8..cf2d1d5 100644
>--- a/source3/libsmb/libsmb_server.c
>+++ b/source3/libsmb/libsmb_server.c
>@@ -500,6 +500,14 @@ again:
>                 }
> 	}
> 
>+	status = cli_init_creds(c, username_used,
>+			*pp_workgroup, *pp_password);
>+	if (!NT_STATUS_IS_OK(status)) {
>+		errno = map_errno_from_nt_status(status);
>+		cli_shutdown(c);
>+		return NULL;
>+	}
>+
> 	DEBUG(4,(" session setup ok\n"));
> 
> 	status = cli_tcon_andx(c, share, "?????", *pp_password,
>-- 
>1.5.4.3
>

Flags:

jmcd: review+

Actions: View

Attachments on bug 6829: 4876 | 4877 | 4878