From: Luk Claes Date: Fri, 17 May 2013 18:46:24 +0000 (+0200) Subject: s3/libsmb: Use smbXcli_conn_dfs_supported instead of test on CAP_DFS X-Git-Url: http://git.samba.org/?p=mat%2Fsamba.git;a=commitdiff_plain;h=114e33717df8b49239ac08399a379a8363d33b85 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 Reviewed-by: Michael Adam Reviewed-by: Stefan Metzmacher --- 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; }