From 9dd1c7da4b06c1a1c1933195b5376d83838f9bac Mon Sep 17 00:00:00 2001 From: Luk Claes Date: Fri, 17 May 2013 20:46:24 +0200 Subject: [PATCH] s3/libsmb: Use smbXcli_conn_dfs_supported instead of test on CAP_DFS Signed-off-by: Luk Claes Reviewed-by: Michael Adam Reviewed-by: Stefan Metzmacher --- source3/libsmb/async_smb.c | 4 ++-- source3/libsmb/clidfs.c | 2 +- source3/libsmb/clitrans.c | 4 ++-- source3/libsmb/libsmb_server.c | 2 +- source3/libsmb/libsmb_stat.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index ed68a5d927c..9d5b58e29dd 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -83,7 +83,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx, additional_flags |= FLAG_CASELESS_PATHNAMES; } - if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) { + if (smbXcli_conn_dfs_supported(cli->conn) && cli->dfsroot) { additional_flags2 |= FLAGS2_DFS_PATHNAMES; } @@ -141,7 +141,7 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx, additional_flags |= FLAG_CASELESS_PATHNAMES; } - if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) { + if (smbXcli_conn_dfs_supported(cli->conn) && cli->dfsroot) { additional_flags2 |= FLAGS2_DFS_PATHNAMES; } diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c index 41996feed12..1cc3dff63a4 100644 --- a/source3/libsmb/clidfs.c +++ b/source3/libsmb/clidfs.c @@ -212,7 +212,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/clitrans.c b/source3/libsmb/clitrans.c index 08fda5fdb52..f9f8d1b2b1b 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -80,7 +80,7 @@ struct tevent_req *cli_trans_send( additional_flags |= FLAG_CASELESS_PATHNAMES; } - if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) { + if (smbXcli_conn_dfs_supported(cli->conn) && cli->dfsroot) { additional_flags2 |= FLAGS2_DFS_PATHNAMES; } @@ -176,7 +176,7 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli, additional_flags |= FLAG_CASELESS_PATHNAMES; } - if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) { + if (smbXcli_conn_dfs_supported(cli->conn) && cli->dfsroot) { additional_flags2 |= FLAGS2_DFS_PATHNAMES; } diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index 0d39245109e..3ca2ebebce8 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -494,7 +494,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 5cfbcb842c5..115bb109690 100644 --- a/source3/libsmb/libsmb_stat.c +++ b/source3/libsmb/libsmb_stat.c @@ -465,7 +465,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; } -- 2.34.1