s3/libsmb: Use smbXcli_conn_dfs_supported instead of test on CAP_DFS

Signed-off-by: Luk Claes <luk@debian.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index ed68a5d927cc7ad2bfd6e0fe8bb180f3d674fe1a..9d5b58e29dde0c3369e2df8683d65dce4b94101c 100644 (file)
--- 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 41996feed128148b518014f4e15cc4d229020d6f..1cc3dff63a46a557b20fb9265f44369e9f2b072c 100644 (file)
--- 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 08fda5fdb5287edb91b67256f41a4ccefaef272a..f9f8d1b2b1bf8ceb29af4e9526aadb671d86645f 100644 (file)
--- 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 0d39245109ecf89483c58e6df6770700f383134e..3ca2ebebce872c389a3b19a42cfdbf48992ea868 100644 (file)
--- 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 5cfbcb842c58166c7961f2ad752b4c80a78306c5..115bb109690579fb7b5bdcf3a03aa85f5f70a94d 100644 (file)
--- 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;
         }