Attachment 11798 Details for Bug 6482 – Patch for 4.3.x and 4.2.x with cherry-pick information

[patch] Patch for 4.3.x and 4.2.x with cherry-pick information

6482.patch (text/plain), 1.87 KB, created by Christian Ambach on 2016-01-28 20:43:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2016-01-28 20:43:05 UTC

Size: 1.87 KB

patch

obsolete

>From afa5c2f5f37c97d042764980b4084ed73d96c4a4 Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Wed, 30 Dec 2015 21:25:13 +0100
>Subject: [PATCH] s3:utils/smbget fix recursive download
>
>get_auth_data is called multiple times (once for the directory listing and then
>for every file to be downloaded). Save the obtained values across multiple calls
>to make smbclient use the correct username for each download.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=6482
>Signed-off-by: Christian Ambach <ambi@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>(cherry picked from commit ec802d27ce4dc6dd9b5e5ebd6992f90364d855a2)
>---
> source3/utils/smbget.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
>diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
>index c3eb471..127d6b1 100644
>--- a/source3/utils/smbget.c
>+++ b/source3/utils/smbget.c
>@@ -91,10 +91,18 @@ static void human_readable(off_t s, char *buffer, int l)
> static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen, char *un, int unlen, char *pw, int pwlen)
> {
> 	static char hasasked = 0;
>+	static char *savedwg;
>+	static char *savedun;
>+	static char *savedpw;
> 	char *wgtmp, *usertmp;
> 	char tmp[128];
> 
>-	if(hasasked) return;
>+	if (hasasked) {
>+		strncpy(wg, savedwg, wglen - 1);
>+		strncpy(un, savedun, unlen - 1);
>+		strncpy(pw, savedpw, pwlen - 1);
>+		return;
>+	}
> 	hasasked = 1;
> 
> 	if(!nonprompt && !username) {
>@@ -119,6 +127,11 @@ static void get_auth_data(const char *srv, const char *shr, char *wg, int wglen,
> 
> 	if(workgroup)strncpy(wg, workgroup, wglen-1);
> 
>+	/* save the values found for later */
>+	savedwg = SMB_STRDUP(wg);
>+	savedun = SMB_STRDUP(un);
>+	savedpw = SMB_STRDUP(pw);
>+
> 	wgtmp = SMB_STRNDUP(wg, wglen); 
> 	usertmp = SMB_STRNDUP(un, unlen);
> 	if(!quiet)printf("Using workgroup %s, %s%s\n", wgtmp, *usertmp?"user ":"guest user", usertmp);
>-- 
>1.9.1
>

Flags:

asn: review+

Actions: View

Attachments on bug 6482: 11753 | 11798