smbd: advertize CAP_CONTINUOUS_AVAILABILITY if "continuous availability" is enabled

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>

diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 04cb63f4d198ce887d49815c241d495e1641e302..7e0b75599f4731853dccb65e56e3144f23c42c82 100644 (file)
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -438,7 +438,7 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
        if (conn->protocol >= PROTOCOL_SMB3_00 &&
            tcon->share_type == SMB2_SHARE_TYPE_DISK)
        {
-               bool persistent = false; /* persistent handles not implemented yet */
+               bool persistent = lp_persistent_handles();
                bool cluster = lp_clustering();
                bool scaleout = cluster;
                bool witness = cluster && !lp_rpc_start_on_demand_helpers();
@@ -450,6 +450,9 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
                 * but windows clients mix this with the global persistent
                 * handles support.
                 *
+                * SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY is only announced if
+                * SMB2_CAP_PERSISTENT_HANDLES is enabled.
+                *
                 * Persistent handles are requested if
                 * SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY is present
                 * even without SMB2_CAP_PERSISTENT_HANDLES.
@@ -457,14 +460,20 @@ static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
                 * And SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY is
                 * required for SMB2_SHARE_CAP_CLUSTER to have
                 * an effect.
-                *
-                * So we better don't announce this by default
-                * until we support persistent handles.
                 */
+
+               persistent &= lp_durable_handles(SNUM(tcon->compat)) &&
+                       !lp_posix_locking(tcon->compat->params) &&
+                       !lp_kernel_share_modes(SNUM(tcon->compat)) &&
+                       !lp_kernel_oplocks(SNUM(tcon->compat));
+
+               announce = persistent && lp_continuous_availability(
+                       SNUM(tcon->compat));
+
                announce = lp_parm_bool(SNUM(tcon->compat),
                                        "smb3 share cap",
                                        "CONTINUOUS AVAILABILITY",
-                                       persistent);
+                                       announce);
                if (announce) {
                        tcon->capabilities |= SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY;
                }