[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  ecae8be... Allow us to pass RAW-CHKPATH with FILE_FLAG_POSIX_SEMANTICS set or with wide links = no. Jeremy. (cherry picked from commit b2dd546f01425ff17008d3b0b0c36f754e6f3eec)
      from  b8c7631... Fix make test. Only do POSIX case conversion if FILE_FLAG_POSIX_SEMANTICS set. Doh ! Jeremy. (cherry picked from commit 187ef6b482273244d3b5b716881ab7b5d328cbc1)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit ecae8be35c745d769ae727505d62fa8c5e57dca4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 24 14:05:56 2009 -0800

    Allow us to pass RAW-CHKPATH with FILE_FLAG_POSIX_SEMANTICS set or with
    wide links = no.
    Jeremy.
    (cherry picked from commit b2dd546f01425ff17008d3b0b0c36f754e6f3eec)

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/filename.c |    3 ++-
 source3/smbd/vfs.c      |   14 +++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 16e3631..88ee42c 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 1510bfc..2ce61ee 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",


-- 
Samba Shared Repository