[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4805-g935173a

Jeremy Allison jra at samba.org
Thu Jan 8 23:43:16 GMT 2009


The branch, v3-3-test has been updated
       via  935173a514bf54ebdf6269e872adfb86a9625f27 (commit)
      from  92c251ace583391ea1540f0ae455399f8a75cecf (commit)

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


- Log -----------------------------------------------------------------
commit 935173a514bf54ebdf6269e872adfb86a9625f27
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 8 15:42:38 2009 -0800

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

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

Summary of changes:
 source/client/client.c |    8 ++++----
 source/libsmb/clidfs.c |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/client.c b/source/client/client.c
index 4d7085e..df92bae 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -728,11 +728,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/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index 35922b1..9fdc239 100644
--- a/source/libsmb/clidfs.c
+++ b/source/libsmb/clidfs.c
@@ -306,10 +306,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);
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list