[PATCH 6/6] s3/libsmb: Use smbXcli_conn_can_dfs instead of test on CAP_DFS

[Luk Claes]

Signed-off-by: Luk Claes <luk at debian.org>
---
 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 ed68a5d..addbad3 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_can_dfs(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_can_dfs(cli->conn) && cli->dfsroot) {
 		additional_flags2 |= FLAGS2_DFS_PATHNAMES;
 	}
 
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 41996fe..3d6d8d0 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_can_dfs(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 08fda5f..fee67eb 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_can_dfs(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_can_dfs(cli->conn) && cli->dfsroot) {
 		additional_flags2 |= FLAGS2_DFS_PATHNAMES;
 	}
 
diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 0d39245..86d92f1 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_can_dfs(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 5cfbcb8..5353585 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_can_dfs(cli->conn) &&  cli->dfsroot) {
                 flags |= SMBC_VFS_FEATURE_DFS;
         }
 
-- 
1.7.10.4