Changeset 751 for trunk/server/source3/param/loadparm.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/param/loadparm.c (modified) (7 diffs)

trunk/server/source3/param/loadparm.c

@@ -384 +384 @@
         bool bAsyncSMBEchoHandler;
         bool bMulticastDnsRegister;
+        bool bAllowInsecureWidelinks;
         int ismb2_max_read;
         int ismb2_max_write;
@@ -4361 +4362 @@
         },
         {
+                .label          = "allow insecure wide links",
+                .type           = P_BOOL,
+                .p_class        = P_GLOBAL,
+                .ptr            = &Globals.bAllowInsecureWidelinks,
+                .special        = NULL,
+                .enum_list      = NULL,
+                .flags          = FLAG_ADVANCED,
+        },
+        {
                 .label          = "wide links",
                 .type           = P_BOOL,
@@ -5610 +5620 @@
 
 FN_GLOBAL_STRING(lp_smb_ports, &Globals.smb_ports)
-FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
-FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
-FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
+FN_GLOBAL_CONST_STRING(lp_dos_charset, &Globals.dos_charset)
+FN_GLOBAL_CONST_STRING(lp_unix_charset, &Globals.unix_charset)
+FN_GLOBAL_CONST_STRING(lp_display_charset, &Globals.display_charset)
 FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)
 FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile)
@@ -6041 +6051 @@
 FN_GLOBAL_BOOL(lp_async_smb_echo_handler, &Globals.bAsyncSMBEchoHandler)
 FN_GLOBAL_BOOL(lp_multicast_dns_register, &Globals.bMulticastDnsRegister)
+FN_GLOBAL_BOOL(lp_allow_insecure_widelinks, &Globals.bAllowInsecureWidelinks)
 FN_LOCAL_BOOL(lp_blocking_locks, bBlockingLocks)
 FN_LOCAL_BOOL(lp_inherit_perms, bInheritPerms)
@@ -9681 +9692 @@
         }
 
-        lp_add_auto_services(lp_auto_services());
+        {
+                char *serv = lp_auto_services();
+                lp_add_auto_services(serv);
+                TALLOC_FREE(serv);
+        }
 
         if (add_ipc) {
@@ -10381 +10396 @@
 void widelinks_warning(int snum)
 {
+        if (lp_allow_insecure_widelinks()) {
+                return;
+        }
+
         if (lp_unix_extensions() && lp_widelinks_internal(snum)) {
                 DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
@@ -10393 +10412 @@
         /* wide links is always incompatible with unix extensions */
         if (lp_unix_extensions()) {
-                return false;
+                /*
+                 * Unless we have "allow insecure widelinks"
+                 * turned on.
+                 */
+                if (!lp_allow_insecure_widelinks()) {
+                        return false;
+                }
         }