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

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

File:

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

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

@@ -34 +34 @@
                                   SMB_STRUCT_STAT *pst,
                                   char **path);
+static int get_real_filename_mangled(connection_struct *conn, const char *path,
+                                     const char *name, TALLOC_CTX *mem_ctx,
+                                     char **found_name);
 
 /****************************************************************************
@@ -448 +451 @@
 
                         if (name_has_wildcard ||
-                            (SMB_VFS_GET_REAL_FILENAME(
+                            (get_real_filename_mangled(
                                      conn, dirpath, start,
                                      talloc_tos(), &found_name) == -1)) {
@@ -790 +793 @@
 ****************************************************************************/
 
-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_mangled(connection_struct *conn, const char *path,
+                                     const char *name, TALLOC_CTX *mem_ctx,
+                                     char **found_name)
 {
-        struct smb_Dir *cur_dir;
-        const char *dname;
         bool mangled;
         char *unmangled_name = NULL;
-        long curpos;
 
         mangled = mangle_is_mangled(name, conn->params);
@@ -839 +839 @@
                         name = unmangled_name;
                 }
-        }
+                return get_real_filename(conn, path, name, mem_ctx,
+                                         found_name);
+        }
+
+        return SMB_VFS_GET_REAL_FILENAME(conn, path, name, mem_ctx,
+                                         found_name);
+}
+
+int get_real_filename(connection_struct *conn, const char *path,
+                      const char *name, TALLOC_CTX *mem_ctx,
+                      char **found_name)
+{
+        struct smb_Dir *cur_dir;
+        const char *dname;
+        bool mangled;
+        char *unmangled_name = NULL;
+        long curpos;
 
         /* open the directory */