smbd: Enable leases by default

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/smbdotconf/locking/smb2leases.xml b/docs-xml/smbdotconf/locking/smb2leases.xml
index 5ca13d2aa9088253de92766ebf44eb1b5e23dde5..65873001ed8852780ba75b69aa12f950cc76c86c 100644 (file)
--- a/docs-xml/smbdotconf/locking/smb2leases.xml
+++ b/docs-xml/smbdotconf/locking/smb2leases.xml
@@ -7,8 +7,7 @@
        This boolean option tells <command moreinfo="none">smbd</command> whether to
        globally negotiate SMB2 leases on file open requests. Leasing is an SMB2-only
        feature which allows clients to aggressively cache files locally above and
-       beyond the caching allowed by SMB1 oplocks. This (experimental) parameter is
-       set to off by default until the SMB2 leasing code is declared fully stable.
+       beyond the caching allowed by SMB1 oplocks.
        </para>
 
        <para>
@@ -18,14 +17,11 @@
 
        <para>Note that the write cache won't be used for file handles with a smb2 write lease.</para>
 
-       <para>
-       The Samba implementation of leases is currently marked as experimental!
-       </para>
 </description>
 
 <related>oplocks</related>
 <related>kernel oplocks</related>
 <related>level2 oplocks</related>
 <related>write cache size</related>
-<value type="default">no</value>
+<value type="default">yes</value>
 </samba:parameter>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 515ed05e8d37ca5578be3a01bc4d5339af8230ed..548d1055a31563401336f5839220284401d88307 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2898,6 +2898,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 
        lpcfg_do_global_parameter(lp_ctx, "aio max threads", "100");
 
+       lpcfg_do_global_parameter(lp_ctx, "smb2 leases", "yes");
+
        /* Allow modules to adjust defaults */
        for (defaults_hook = defaults_hooks; defaults_hook;
                 defaults_hook = defaults_hook->next) {

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index f5f4c0c3e0181656a9636ea26ab25d820f9a0031..b5ea469184fe85560dc4ede7b34842c6da81ae8e 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1411,7 +1411,6 @@ sub provision($$$$$$$$)
 
        kernel oplocks = no
        kernel change notify = no
-       smb2 leases = yes
 
        logging = file
        printing = bsd

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index b09bb662515d1095d2a31bef4ab9fb570299b40c..9d96c166d2b2f1bb6156173e3d55d5b4ed8c0cc9 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1652,6 +1652,7 @@ sub provision_ad_dc($$)
 
        kernel oplocks = no
        kernel change notify = no
+       smb2 leases = no
 
        logging = file
        printing = bsd

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index df700bcb7635b7aa13b1618119152f4714c43bab..71e9e2ec14c5b635918115f747fa1fbbf5e2a2e1 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -862,7 +862,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.smb2_max_write = DEFAULT_SMB2_MAX_WRITE;
        Globals.smb2_max_trans = DEFAULT_SMB2_MAX_TRANSACT;
        Globals.smb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
-       Globals.smb2_leases = false;
+       Globals.smb2_leases = true;
 
        lpcfg_string_set(Globals.ctx, &Globals.ncalrpc_dir,
                         get_dyn_NCALRPCDIR());