Fix bug 7104 - "wide links" and "unix extensions" are incompatible.

Change parameter "wide links" to default to "no".
Ensure "wide links = no" if "unix extensions = yes" on a share.
Fix man pages to refect this.

Remove "within share" checks for a UNIX symlink set - even if
widelinks = no. The server will not follow that link anyway.

Correct DEBUG message in check_reduced_name() to add missing "\n"
so it's really clear when a path is being denied as it's outside
the enclosing share path.

Jeremy.
(cherry picked from commit 9e64c33b7757dd4528a9c8d31d0c0c159a33daf8)

diff --git a/docs-xml/smbdotconf/misc/widelinks.xml b/docs-xml/smbdotconf/misc/widelinks.xml
index fb707c1950a191d6dcc608bdf1c68fdc1714ba8d..1c30bb768a3b44ec34850abcb2406ad0139b1137 100644 (file)
--- a/docs-xml/smbdotconf/misc/widelinks.xml
+++ b/docs-xml/smbdotconf/misc/widelinks.xml
@@ -9,10 +9,15 @@
        server are always allowed; this parameter controls access only 
        to areas that are outside the directory tree being exported.</para>
 
-       <para>Note that setting this parameter can have a negative 
-       effect on your server performance due to the extra system calls 
-       that Samba has to  do in order to perform the link checks.</para>
+       <para>Note: Turning this parameter on when UNIX extensions are enabled
+       will allow UNIX clients to create symbolic links on the share that
+       can point to files or directories outside restricted path exported
+       by the share definition. This can cause access to areas outside of
+       the share. Due to this problem, this parameter will be automatically
+       disabled (with a message in the log file) if the
+       <smbconfoption name="unix extensions"/> option is on.
+       </para>
 </description>
 
-<value type="default">yes</value>
+<value type="default">no</value>
 </samba:parameter>

diff --git a/docs-xml/smbdotconf/protocol/unixextensions.xml b/docs-xml/smbdotconf/protocol/unixextensions.xml
index da9ad10a295ffff0e3dc6b69666f5fd21ce3507f..36e72d2a9f5a4d8bd3defb466413ee7f36282efd 100644 (file)
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -10,6 +10,9 @@
     by supporting features such as symbolic links, hard links, etc...
     These extensions require a similarly enabled client, and are of
     no current use to Windows clients.</para>
+    <para>
+    Note if this parameter is turned on, the <smbconfoption name="wide links"/>
+    parameter will automatically be disabled.
 </description>
 
 <value type="default">yes</value>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ccf642d0d4d9607e5dd628b90fe5344fa7e0e184..6e5e0b2e069fd3f7ce115b9f474204d8fd45a0d3 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -598,7 +598,7 @@ static struct service sDefault = {
        True,                   /* bLevel2OpLocks */
        False,                  /* bOnlyUser */
        True,                   /* bMangledNames */
-       True,                   /* bWidelinks */
+       false,                  /* bWidelinks */
        True,                   /* bSymlinks */
        False,                  /* bSyncAlways */
        False,                  /* bStrictAllocate */

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 1bbe0c863f30d68f803d4bb6ec22c531be1fd9b7..2dd1f5ac52cc594feb117fbee4a0761d651b374b 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1032,6 +1032,14 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
        }
 #endif
 
+       if (lp_unix_extensions() && lp_widelinks(snum)) {
+               DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
+                       "These parameters are incompatible. "
+                       "Disabling wide links for this share.\n",
+                       lp_servicename(snum) ));
+               lp_do_parameter(snum, "wide links", "False");
+       }
+
        /* Figure out the characteristics of the underlying filesystem. This
         * assumes that all the filesystem mounted withing a share path have
         * the same characteristics, which is likely but not guaranteed.

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index f665bfb36d0d25988704ad08b69941850891e29a..e6d2b0ab8d2170515dfd0391aeb73cc4f846eed8 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5271,7 +5271,6 @@ static NTSTATUS smb_set_file_unix_link(connection_struct *conn,
 {
        char *link_target = NULL;
        const char *newname = fname;
-       NTSTATUS status = NT_STATUS_OK;
        TALLOC_CTX *ctx = talloc_tos();
 
        /* Set a symbolic link. */
@@ -5292,42 +5291,6 @@ static NTSTATUS smb_set_file_unix_link(connection_struct *conn,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       /* !widelinks forces the target path to be within the share. */
-       /* This means we can interpret the target as a pathname. */
-       if (!lp_widelinks(SNUM(conn))) {
-               char *rel_name = NULL;
-               char *last_dirp = NULL;
-
-               if (*link_target == '/') {
-                       /* No absolute paths allowed. */
-                       return NT_STATUS_ACCESS_DENIED;
-               }
-               rel_name = talloc_strdup(ctx,newname);
-               if (!rel_name) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-               last_dirp = strrchr_m(rel_name, '/');
-               if (last_dirp) {
-                       last_dirp[1] = '\0';
-               } else {
-                       rel_name = talloc_strdup(ctx,"./");
-                       if (!rel_name) {
-                               return NT_STATUS_NO_MEMORY;
-                       }
-               }
-               rel_name = talloc_asprintf_append(rel_name,
-                               "%s",
-                               link_target);
-               if (!rel_name) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-               status = check_name(conn, rel_name);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return status;
-               }
-       }
-
        DEBUG(10,("smb_set_file_unix_link: SMB_SET_FILE_UNIX_LINK doing symlink %s -> %s\n",
                        newname, link_target ));
 

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 426772889c7a30c5f38700a5a940b6a0132e8a8d..fd7f91f361fcba6563c63ff5586d45b6a327a8df 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -946,7 +946,7 @@ NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
 
        /* Check for widelinks allowed. */
        if (!lp_widelinks(SNUM(conn)) && (strncmp(conn->connectpath, resolved_name, con_path_len) != 0)) {
-               DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path", fname));
+               DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path\n", fname));
                if (free_resolved_name) {
                        SAFE_FREE(resolved_name);
                }