From: Volker Lendecke <vl@samba.org>
Date: Thu, 23 Apr 2009 12:54:52 +0000 (+0200)
Subject: Revert "Do not use the file system GET_REAL_FILENAME for mangled names"
X-Git-Tag: tdb-1.1.5~919^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1722859abd169f2949b5822f97c810f2b8d162da;p=thirdparty%2Fsamba.git

Revert "Do not use the file system GET_REAL_FILENAME for mangled names"

This reverts commit b5b6ecb58aeba196c28370cde21a0826f81d8da6.
---

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index e35f23ef377..80722a7cd08 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -33,9 +33,6 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
 				  const char *streamname,
 				  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);
 
 /****************************************************************************
  Mangle the 2nd name and check if it is then equal to the first name.
@@ -450,7 +447,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 			 */
 
 			if (name_has_wildcard ||
-			    (get_real_filename_mangled(
+			    (SMB_VFS_GET_REAL_FILENAME(
 				     conn, dirpath, start,
 				     talloc_tos(), &found_name) == -1)) {
 				char *unmangled;
@@ -792,12 +789,15 @@ static bool fname_equal(const char *name1, const char *name2,
  If the name looks like a mangled name then try via the mangling functions
 ****************************************************************************/
 
-static int get_real_filename_mangled(connection_struct *conn, const char *path,
-				     const char *name, TALLOC_CTX *mem_ctx,
-				     char **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;
 
 	mangled = mangle_is_mangled(name, conn->params);
 
@@ -838,24 +838,8 @@ static int get_real_filename_mangled(connection_struct *conn, const char *path,
 			/* Name is now unmangled. */
 			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 */
 	if (!(cur_dir = OpenDir(talloc_tos(), conn, path, NULL, 0))) {
 		DEBUG(3,("scan dir didn't open dir [%s]\n",path));