r1115: Fix for #1427. Catch bad path errors at the right point. Ensure all

our pathname parsing is consistent.
Jeremy.
(This used to be commit 5e8237e306f0bb0e492f10fb6487938132899384)

1 files changed, 9 insertions, 0 deletions

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 86f180e543..13cfdac0f3 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -829,6 +829,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 	char *resolved_name = NULL;
 	size_t con_path_len = strlen(conn->connectpath);
 	char *p = NULL;
+	int saved_errno = errno;
 
 	DEBUG(3,("reduce_name [%s] [%s]\n", fname, conn->connectpath));
 
@@ -842,6 +843,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 		switch (errno) {
 			case ENOTDIR:
 				DEBUG(3,("reduce_name: Component not a directory in getting realpath for %s\n", fname));
+				errno = saved_errno;
 				return False;
 			case ENOENT:
 			{
@@ -866,6 +868,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 #endif
 				if (!resolved_name) {
 					DEBUG(3,("reduce_name: couldn't get realpath for %s\n", fname));
+					errno = saved_errno;
 					return False;
 				}
 				pstrcpy(tmp_fname, resolved_name);
@@ -876,6 +879,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 				resolved_name = strdup(tmp_fname);
 				if (!resolved_name) {
 					DEBUG(0,("reduce_name: malloc fail for %s\n", tmp_fname));
+					errno = saved_errno;
 					return False;
 				}
 #else
@@ -890,6 +894,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 			}
 			default:
 				DEBUG(1,("reduce_name: couldn't get realpath for %s\n", fname));
+				errno = saved_errno;
 				return False;
 		}
 	}
@@ -900,6 +905,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 		DEBUG(0,("reduce_name: realpath doesn't return absolute paths !\n"));
 		if (free_resolved_name)
 			SAFE_FREE(resolved_name);
+		errno = saved_errno;
 		return False;
 	}
 
@@ -907,6 +913,7 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 		DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path", fname));
 		if (free_resolved_name)
 			SAFE_FREE(resolved_name);
+		errno = EACCES;
 		return False;
 	}
 
@@ -925,11 +932,13 @@ BOOL reduce_name(connection_struct *conn, pstring fname)
 		DEBUG(3,("reduce_name: denied: file path name %s is a symlink\n",fname));
 		if (free_resolved_name)
 			SAFE_FREE(resolved_name);
+		errno = EACCES;
 		return False;
 	}
 
 	DEBUG(3,("reduce_name: %s reduced to %s\n", fname, p));
 	if (free_resolved_name)
 		SAFE_FREE(resolved_name);
+	errno = saved_errno;
 	return(True);
 }