The branch, v3-5-test has been updated via 0d929df Fix for servers that don't put a path separator at the end of the service. from 5fc7b78 s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit 0d929df7d194574d283ea5b9f4f8a45d6d214a54 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. Fix bug 8055 - Can't See Parts of DFS CIFS Share. ----------------------------------------------------------------------- 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 c588c16..0a6b902 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -896,10 +896,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