Changeset 274 for branches/samba-3.3.x/source/smbd/filename.c

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/smbd/filename.c (modified) (6 diffs)

branches/samba-3.3.x/source/smbd/filename.c

@@ -37 +37 @@
                                      const char *name, TALLOC_CTX *mem_ctx,
                                      char **found_name);
+static int get_real_filename_internal(connection_struct *conn,
+                                      const char *path, const char *name,
+                                      bool mangled,
+                                      TALLOC_CTX *mem_ctx, char **found_name);
 
 /****************************************************************************
@@ -494 +498 @@
                                 }
 
-                                /* ENOENT is the only valid error here. */
-                                if ((errno != 0) && (errno != ENOENT)) {
+                                /*
+                                 * ENOENT/EACCESS are the only valid errors
+                                 * here. EACCESS needs handling here for
+                                 * "dropboxes", i.e. directories where users
+                                 * can only put stuff with permission -wx.
+                                 */
+                                if ((errno != 0) && (errno != ENOENT)
+                                    && (errno != EACCES)) {
                                         /*
                                          * ENOTDIR and ELOOP both map to
@@ -505 +515 @@
                                                 result =
                                                 NT_STATUS_OBJECT_PATH_NOT_FOUND;
-                                        }
-                                        else {
+                                        } else {
                                                 result =
                                                 map_nt_error_from_unix(errno);
@@ -838 +847 @@
                         /* Name is now unmangled. */
                         name = unmangled_name;
-                }
-                return get_real_filename(conn, path, name, mem_ctx,
-                                         found_name);
+                } else {
+                        /*
+                         * If we have mangled names, do not ask the VFS'es
+                         * GET_REAL_FILENAME. The Unix file system below does
+                         * not know about Samba's style of mangling.
+                         *
+                         * Boolean flags passed down are evil, the alternative
+                         * would be to pass a comparison function down into
+                         * the loop in get_real_filename_internal(). For now,
+                         * do the quick&dirty boolean flag approach.
+                         */
+                        return get_real_filename_internal(conn, path, name,
+                                                          true,
+                                                          mem_ctx, found_name);
+                }
         }
 
@@ -847 +868 @@
 }
 
-int get_real_filename(connection_struct *conn, const char *path,
-                      const char *name, TALLOC_CTX *mem_ctx,
-                      char **found_name)
+static int get_real_filename_internal(connection_struct *conn,
+                                      const char *path, const char *name,
+                                      bool mangled,
+                                      TALLOC_CTX *mem_ctx, char **found_name)
 {
         struct smb_Dir *cur_dir;
         const char *dname;
-        bool mangled;
         char *unmangled_name = NULL;
         long curpos;
@@ -902 +923 @@
         errno = ENOENT;
         return -1;
+}
+
+
+
+int get_real_filename(connection_struct *conn,
+                      const char *path, const char *name,
+                      TALLOC_CTX *mem_ctx, char **found_name)
+{
+        /*
+         * This is the default VFS function. If we end up here, we know we
+         * don't have mangled names around.
+         */
+        return get_real_filename_internal(conn, path, name, false,
+                                          mem_ctx, found_name);
 }