diff options
author | Luk Claes <luk@debian.org> | 2013-05-17 20:46:24 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2013-10-17 16:15:05 +0200 |
commit | 114e33717df8b49239ac08399a379a8363d33b85 (patch) | |
tree | d09c8ecdfbcbf4ee3fde71861df5569f5d45b23f | |
parent | 451b11251f7f3a517f94c5d57dab327a30bab52f (diff) | |
download | samba-114e33717df8b49239ac08399a379a8363d33b85.tar.gz samba-114e33717df8b49239ac08399a379a8363d33b85.tar.bz2 samba-114e33717df8b49239ac08399a379a8363d33b85.zip |
s3/libsmb: Use smbXcli_conn_dfs_supported instead of test on CAP_DFS
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10200
Signed-off-by: Luk Claes <luk@debian.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r-- | source3/libsmb/clidfs.c | 2 | ||||
-rw-r--r-- | source3/libsmb/libsmb_server.c | 2 | ||||
-rw-r--r-- | source3/libsmb/libsmb_stat.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index e311adab27..83bfdcf17e 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -234,7 +234,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx, here before trying to connect to the original share. cli_check_msdfs_proxy() will fail if it is a normal share. */ - if ((smb1cli_conn_capabilities(c->conn) & CAP_DFS) && + if (smbXcli_conn_dfs_supported(c->conn) && cli_check_msdfs_proxy(ctx, c, sharename, &newserver, &newshare, force_encrypt, diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index 35b31d85db..357dc28088 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -497,7 +497,7 @@ SMBC_server_internal(TALLOC_CTX *ctx, here before trying to connect to the original share. cli_check_msdfs_proxy() will fail if it is a normal share. */ - if ((smb1cli_conn_capabilities(c->conn) & CAP_DFS) && + if (smbXcli_conn_dfs_supported(c->conn) && cli_check_msdfs_proxy(ctx, c, share, &newserver, &newshare, /* FIXME: cli_check_msdfs_proxy() does diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c index fbbd887edf..dc59f9cc82 100644 --- a/source3/libsmb/libsmb_stat.c +++ b/source3/libsmb/libsmb_stat.c @@ -469,7 +469,7 @@ SMBC_fstatvfs_ctx(SMBCCTX *context, } /* See if DFS is supported */ - if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) { + if (smbXcli_conn_dfs_supported(cli->conn) && cli->dfsroot) { flags |= SMBC_VFS_FEATURE_DFS; } |