diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-20 10:01:17 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-20 10:01:17 +1100 |
| commit | 9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (patch) | |
| tree | 94bd92a2eec2f966577ebba35468530b1f315aba /source3/libsmb/clidfs.c | |
| parent | 844a1b3cd27f323087b707e494c5e3860340eb27 (diff) | |
| parent | 3a4638db0351368d3b148bf547546f28fa0b1479 (diff) | |
| download | samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.gz samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.xz samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libsmb/clidfs.c')
| -rw-r--r-- | source3/libsmb/clidfs.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 18e7ab1dec..430807eb7f 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -551,13 +551,23 @@ static char *cli_dfs_make_full_path(TALLOC_CTX *ctx, struct cli_state *cli, const char *dir) { + char path_sep = '\\'; + /* Ensure the extrapath doesn't start with a separator. */ while (IS_DIRECTORY_SEP(*dir)) { dir++; } - return talloc_asprintf(ctx, "\\%s\\%s\\%s", - cli->desthost, cli->share, dir); + if (cli->posix_capabilities & CIFS_UNIX_POSIX_PATHNAMES_CAP) { + path_sep = '/'; + } + return talloc_asprintf(ctx, "%c%s%c%s%c%s", + path_sep, + cli->desthost, + path_sep, + cli->share, + path_sep, + dir); } /******************************************************************** |