The branch, v3-6-test has been updated
via 9b9dc24 Fix for servers that don't put a path separator at the end
of the service.
from ceea108 s3:waf: add cluster support / ctdb checks.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 9b9dc24a26a4fbe73b3f958a14ce1d1ffad0a6d1
Author: Larry Reid <lcr...@jadesystems.ca>
Date: Sat Mar 26 15:39:27 2011 -0700
Fix for servers that don't put a path separator at the end of the service.
Autobuild-User: Volker Lendecke <vlen...@samba.org>
Autobuild-Date: Sun Apr 3 10:33:42 CEST 2011 on sn-devel-104
(cherry picked from commit 76f7c2a2541259156f08626f73cb63b6044e4e34)
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/clidfs.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index c6fe67f..e375fcd 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -917,10 +917,19 @@ bool cli_resolve_path(TALLOC_CTX *ctx,
}
if (extrapath && strlen(extrapath) > 0) {
- *pp_targetpath = talloc_asprintf(ctx,
- "%s%s",
- extrapath,
- *pp_targetpath);
+ /* EMC Celerra NAS version 5.6.50 (at least) doesn't appear to
*/
+ /* put the trailing \ on the path, so to be save we put one in
if needed */
+ if (extrapath[strlen(extrapath)-1] != '\\' && **pp_targetpath
!= '\\') {
+ *pp_targetpath = talloc_asprintf(ctx,
+ "%s\\%s",
+ extrapath,
+ *pp_targetpath);
+ } else {
+ *pp_targetpath = talloc_asprintf(ctx,
+ "%s%s",
+ extrapath,
+ *pp_targetpath);
+ }
if (!*pp_targetpath) {
return false;
}
--
Samba Shared Repository
