[SCM] Samba Shared Repository - branch master updated -
590c9b7b6df643f0ff3e8f36bdc535ef00b30073
Jeremy Allison
jra at samba.org
Thu Jan 8 23:42:48 GMT 2009
The branch, master has been updated
via 590c9b7b6df643f0ff3e8f36bdc535ef00b30073 (commit)
from 84292022bf801112d2cb7f0f8512cf00079def20 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 590c9b7b6df643f0ff3e8f36bdc535ef00b30073
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 15:41:49 2009 -0800
Fix bug #6021 - smbclient du command does not recuse properly
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/client/client.c | 8 ++++----
source3/libsmb/clidfs.c | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index c40c04e..adcbffe 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 ac68700..211aca2 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);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list