From: Jeremy Allison <jra@samba.org>
Date: Thu, 8 Jan 2009 23:41:49 +0000 (-0800)
Subject: Fix bug #6021 - smbclient du command does not recuse properly
X-Git-Tag: samba-4.0.0alpha6~185
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=590c9b7b6df643f0ff3e8f36bdc535ef00b30073;p=thirdparty%2Fsamba.git

Fix bug #6021 - smbclient du command does not recuse properly
Jeremy.
---

diff --git a/source3/client/client.c b/source3/client/client.c
index c40c04e9c67..adcbffe6fac 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -747,11 +747,11 @@ static void do_list_helper(const char *mntpoint, file_info *f, const char *mask,
 				return;
 			}
 			p = strrchr_m(mask2,CLI_DIRSEP_CHAR);
-			if (!p) {
-				TALLOC_FREE(dir);
-				return;
+			if (p) {
+				p[1] = 0;
+			} else {
+				mask2[0] = '\0';
 			}
-			p[1] = 0;
 			mask2 = talloc_asprintf_append(mask2,
 					"%s%s*",
 					f->name,
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index ac68700fd08..211aca2bd8f 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -308,10 +308,11 @@ static void cli_cm_set_mntpoint(struct cli_state *c, const char *mnt)
 	}
 
 	if (p) {
-		char *name = clean_name(NULL, p->mount);
+		char *name = clean_name(NULL, mnt);
 		if (!name) {
 			return;
 		}
+		TALLOC_FREE(p->mount);
 		p->mount = talloc_strdup(p, name);
 		TALLOC_FREE(name);
 	}