s3: add an option "kernel share modes" to be able to switch off using kernel flocks

[gd/samba-autobuild/.git] / source3 / param / loadparm.c

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2c77691373dae15caefb37a3bc28db29af03bbe2..563d6446a00de405b1dce12fdba887144a6716bd 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -232,7 +232,6 @@ static struct loadparm_service sDefault =
        .bLocking = true,
        .iStrictLocking = Auto,
        .bPosixLocking = true,
-       .bShareModes = true,
        .bOpLocks = true,
        .bKernelOplocks = false,
        .bLevel2OpLocks = true,
@@ -282,6 +281,7 @@ static struct loadparm_service sDefault =
        .iDirectoryNameCacheSize = 100,
 #endif
        .ismb_encrypt = SMB_SIGNING_DEFAULT,
+       .bKernelShareModes = true,
        .param_opt = NULL,
        .dummy = ""
 };
@@ -831,7 +831,7 @@ static void init_globals(bool reinit_globals)
        Globals.max_log_size = 5000;
        Globals.max_open_files = max_open_files();
        Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE;
-       Globals.srv_maxprotocol = PROTOCOL_SMB2_10;
+       Globals.srv_maxprotocol = PROTOCOL_SMB3_00;
        Globals.srv_minprotocol = PROTOCOL_LANMAN1;
        Globals.security = SEC_USER;
        Globals.bEncryptPasswords = true;
@@ -1804,8 +1804,6 @@ bool lp_add_printer(const char *pszPrintername, int iDefaultService)
 
        /* Printers cannot be read_only. */
        ServicePtrs[i]->bRead_only = false;
-       /* No share modes on printer services. */
-       ServicePtrs[i]->bShareModes = false;
        /* No oplocks on printer services. */
        ServicePtrs[i]->bOpLocks = false;
        /* Printer services must be printable. */