From: Jeremy Allison <jra@samba.org>
Date: Tue, 24 Nov 2009 22:05:56 +0000 (-0800)
Subject: Allow us to pass RAW-CHKPATH with FILE_FLAG_POSIX_SEMANTICS set or with
X-Git-Tag: samba-4.0.0alpha9~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2dd546f01425ff17008d3b0b0c36f754e6f3eec;p=thirdparty%2Fsamba.git

Allow us to pass RAW-CHKPATH with FILE_FLAG_POSIX_SEMANTICS set or with
wide links = no.
Jeremy.
---

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 16e36312bbf..88ee42ce08f 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -791,7 +791,8 @@ NTSTATUS check_name(connection_struct *conn, const char *name)
 		}
 	}
 
-	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
+	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn)) ||
+			conn->case_sensitive) {
 		NTSTATUS status = check_reduced_name(conn,name);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(5,("check_name: name %s failed with %s\n",name,
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 1510bfcdd53..2ce61eed30c 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -862,7 +862,7 @@ NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
 				DEBUG(3,("check_reduced_name: Component not a "
 					 "directory in getting realpath for "
 					 "%s\n", fname));
-				return map_nt_error_from_unix(errno);
+				return NT_STATUS_OBJECT_PATH_NOT_FOUND;
 			case ENOENT:
 			{
 				TALLOC_CTX *ctx = talloc_tos();
@@ -893,10 +893,18 @@ NTSTATUS check_reduced_name(connection_struct *conn, const char *fname)
 				resolved_name = SMB_VFS_REALPATH(conn,tmp_fname,resolved_name_buf);
 #endif
 				if (!resolved_name) {
+					NTSTATUS status = map_nt_error_from_unix(errno);
+
+					if (errno == ENOENT || errno == ENOTDIR) {
+						status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+					}
+
 					DEBUG(3,("check_reduce_named: "
 						 "couldn't get realpath for "
-						 "%s\n", fname));
-					return map_nt_error_from_unix(errno);
+						 "%s (%s)\n",
+						fname,
+						nt_errstr(status)));
+					return status;
 				}
 				tmp_fname = talloc_asprintf(ctx,
 						"%s/%s",