Changeset 411 for branches/samba-3.3.x/source/param/loadparm.c

Timestamp:

Mar 1, 2010, 3:05:48 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.11

File:

• branches/samba-3.3.x/source/param/loadparm.c (modified) (3 diffs)

branches/samba-3.3.x/source/param/loadparm.c

@@ -590 +590 @@
         False,                  /* bOnlyUser */
         True,                   /* bMangledNames */
-#ifndef __OS2__
-        /* Future default in newer Samba versions */
-        True,                   /* bWidelinks */
-#else
         False,                  /* bWidelinks */
-#endif
         True,                   /* bSymlinks */
         False,                  /* bSyncAlways */
@@ -5362 +5357 @@
 FN_LOCAL_BOOL(lp_onlyuser, bOnlyUser)
 FN_LOCAL_PARM_BOOL(lp_manglednames, bMangledNames)
-FN_LOCAL_BOOL(lp_widelinks, bWidelinks)
 FN_LOCAL_BOOL(lp_symlinks, bSymlinks)
 FN_LOCAL_BOOL(lp_syncalways, bSyncAlways)
@@ -9610 +9604 @@
         return  Globals.szSocketAddress;
 }
+
+/*******************************************************************
+ Safe wide links checks.
+ This helper function always verify the validity of wide links,
+ even after a configuration file reload.
+********************************************************************/
+
+static bool lp_widelinks_internal(int snum)
+{
+        return (bool)(LP_SNUM_OK(snum)? ServicePtrs[(snum)]->bWidelinks :
+                        sDefault.bWidelinks);
+}
+
+void widelinks_warning(int snum)
+{
+        if (lp_unix_extensions() && lp_widelinks_internal(snum)) {
+                DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
+                        "These parameters are incompatible. "
+                        "Wide links will be disabled for this share.\n",
+                        lp_servicename(snum) ));
+        }
+}
+
+bool lp_widelinks(int snum)
+{
+        /* wide links is always incompatible with unix extensions */
+        if (lp_unix_extensions()) {
+                return false;
+        }
+
+        return lp_widelinks_internal(snum);
+}