sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

s3:utils/smbget fix recursive download

Browse Source 
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)
This commit is contained in:
Christian Ambach 2015-12-30 21:25:13 +01:00 committed by Karolin Seeger
parent 155d821b7b
commit 67db3036a0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/utils/smbget.c
View File

@ -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);