summaryrefslogtreecommitdiff
path: root/source3/libsmb/clidfs.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-04-13 18:41:14 -0700
committerJeremy Allison <jra@samba.org>2010-04-13 18:41:14 -0700
commitf3b8e31f83c44f1e72b15711542d817af7ec9506 (patch)
treed2747a4497220392a2f12ac47cb4c6640eb2ac68 /source3/libsmb/clidfs.c
parent589a42e2da7d7cd382deb94c57b0c6dbca269e55 (diff)
downloadsamba-f3b8e31f83c44f1e72b15711542d817af7ec9506.tar.gz
samba-f3b8e31f83c44f1e72b15711542d817af7ec9506.tar.bz2
samba-f3b8e31f83c44f1e72b15711542d817af7ec9506.zip
Split out the client unix capabilities to those the server offered, and those the client asked for.
This fixes a bug when using encrypted transport and DFS links. Found by my basic DFS torture test, which I'll check in next. Testing *rocks* :-). Jeremy.
Diffstat (limited to 'source3/libsmb/clidfs.c')
-rw-r--r--source3/libsmb/clidfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index d5ae11ff8d..345d0f9212 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -320,7 +320,7 @@ static struct cli_state *cli_cm_connect(TALLOC_CTX *ctx,
DLIST_ADD_END(referring_cli, cli, struct cli_state *);
}
- if (referring_cli && referring_cli->posix_capabilities) {
+ if (referring_cli && referring_cli->requested_posix_capabilities) {
uint16 major, minor;
uint32 caplow, caphigh;
NTSTATUS status;
@@ -564,7 +564,7 @@ static char *cli_dfs_make_full_path(TALLOC_CTX *ctx,
dir++;
}
- if (cli->posix_capabilities & CIFS_UNIX_POSIX_PATHNAMES_CAP) {
+ if (cli->requested_posix_capabilities & CIFS_UNIX_POSIX_PATHNAMES_CAP) {
path_sep = '/';
}
return talloc_asprintf(ctx, "%c%s%c%s%c%s",