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>

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index e311adab27351478046d38e5592f50b0b507c957..83bfdcf17ed855835b14caa2a28625bf7ce2d7e1 100644 (file)
--- 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 35b31d85dbecae88a7669d587d8336862805f1b9..357dc280888c8fe8a27262f2597404874018bd7c 100644 (file)
--- 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 fbbd887edf11689672864b10dd4ce148cc9fd487..dc59f9cc82fc27fca31095484b90ed3bf5d04a80 100644 (file)
--- 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;
         }