Attachment 5089 Details for Bug 6875 – git-am format patch for 3.3.x - second part of fix.

[patch] git-am format patch for 3.3.x - second part of fix.

0001-Second-part-of-fix-for-6875-trans2-FIND_FIRST2-res.patch (text/plain), 5.17 KB, created by Jeremy Allison on 2009-12-15 20:42:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-12-15 20:42:30 UTC

Size: 5.17 KB

patch

obsolete

>From d7a920995bfb7ff56b6bbb6f2adcff7f576e7cf1 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 15 Dec 2009 18:38:06 -0800
>Subject: [PATCH] Second part of fix for 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dial
>MIME-Version: 1.0
>Content-Type: text/plain; charset=utf-8
>Content-Transfer-Encoding: 8bit
>
>Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned attributes by protocol level.
>This makes us consistant in returning DOS attrs across all replies. Tested on OS/2 by GÃ¼nter Kukkukk.
>Jeremy.
>---
> source/smbd/dosmode.c |   28 ++++++++++++++++++++--------
> source/smbd/trans2.c  |   15 +++++----------
> 2 files changed, 25 insertions(+), 18 deletions(-)
>
>diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c
>index 07e1103..c7c9f3e 100644
>--- a/source/smbd/dosmode.c
>+++ b/source/smbd/dosmode.c
>@@ -22,6 +22,18 @@
> 
> extern enum protocol_types Protocol;
> 
>+static uint32_t filter_mode_by_protocol(uint32_t mode)
>+{
>+	if (Protocol <= PROTOCOL_LANMAN2) {
>+		DEBUG(10,("filter_mode_by_protocol: "
>+			"filtering result 0x%x to 0x%x\n",
>+			(unsigned int)mode,
>+			(unsigned int)(mode & 0x3f) ));
>+		mode &= 0x3f;
>+	}
>+	return mode;
>+}
>+
> static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
> {
> #if defined (HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
>@@ -337,12 +349,12 @@ uint32 dos_mode_msdfs(connection_struct *conn, const char *path,SMB_STRUCT_STAT
> 		result |= aHIDDEN;
> 	}
> 
>-	if (Protocol <= PROTOCOL_LANMAN2) {
>-		DEBUG(10,("dos_mode_msdfs : filtering result 0x%x\n",
>-			(unsigned int)result ));
>-		result &= 0xff;
>+	if (result == 0) {
>+		result = FILE_ATTRIBUTE_NORMAL;
> 	}
> 
>+	result = filter_mode_by_protocol(result);
>+
> 	DEBUG(8,("dos_mode_msdfs returning "));
> 
> 	if (result & aHIDDEN) DEBUG(8, ("h"));
>@@ -408,12 +420,12 @@ uint32 dos_mode(connection_struct *conn, const char *path,SMB_STRUCT_STAT *sbuf)
> 		result |= aHIDDEN;
> 	}
> 
>-	if (Protocol <= PROTOCOL_LANMAN2) {
>-		DEBUG(10,("dos_mode : filtering result 0x%x\n",
>-			(unsigned int)result ));
>-		result &= 0xff;
>+	if (result == 0) {
>+		result = FILE_ATTRIBUTE_NORMAL;
> 	}
> 
>+	result = filter_mode_by_protocol(result);
>+
> 	DEBUG(8,("dos_mode returning "));
> 
> 	if (result & aHIDDEN) DEBUG(8, ("h"));
>diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
>index 21f70d0..4d6d55c 100644
>--- a/source/smbd/trans2.c
>+++ b/source/smbd/trans2.c
>@@ -1269,7 +1269,6 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 	char *nameptr;
> 	char *last_entry_ptr;
> 	bool was_8_3;
>-	uint32 nt_extmode; /* Used for NT connections instead of mode */
> 	bool needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
> 	bool check_mangled_names = lp_manglednames(conn->params);
> 	char mangled_name[13]; /* mangled 8.3 name. */
>@@ -1456,8 +1455,6 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 	p = pdata;
> 	last_entry_ptr = p;
> 
>-	nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
>-
> 	switch (info_level) {
> 		case SMB_FIND_INFO_STANDARD:
> 			DEBUG(10,("get_lanman2_dir_entry: SMB_FIND_INFO_STANDARD\n"));
>@@ -1604,7 +1601,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 			put_long_date_timespec(p,mdate_ts); p += 8;
> 			SOFF_T(p,0,file_size); p += 8;
> 			SOFF_T(p,0,allocation_size); p += 8;
>-			SIVAL(p,0,nt_extmode); p += 4;
>+			SIVAL(p,0,mode); p += 4;
> 			q = p; p += 4; /* q is placeholder for name length. */
> 			{
> 				unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
>@@ -1655,7 +1652,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 			put_long_date_timespec(p,mdate_ts); p += 8;
> 			SOFF_T(p,0,file_size); p += 8;
> 			SOFF_T(p,0,allocation_size); p += 8;
>-			SIVAL(p,0,nt_extmode); p += 4;
>+			SIVAL(p,0,mode); p += 4;
> 			len = srvstr_push(base_data, flags2,
> 					  p + 4, fname, PTR_DIFF(end_data, p+4),
> 					  STR_TERMINATE_ASCII);
>@@ -1678,7 +1675,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 			put_long_date_timespec(p,mdate_ts); p += 8;
> 			SOFF_T(p,0,file_size); p += 8;
> 			SOFF_T(p,0,allocation_size); p += 8;
>-			SIVAL(p,0,nt_extmode); p += 4;
>+			SIVAL(p,0,mode); p += 4;
> 			q = p; p += 4; /* q is placeholder for name length. */
> 			{
> 				unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
>@@ -1727,7 +1724,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 			put_long_date_timespec(p,mdate_ts); p += 8;
> 			SOFF_T(p,0,file_size); p += 8;
> 			SOFF_T(p,0,allocation_size); p += 8;
>-			SIVAL(p,0,nt_extmode); p += 4;
>+			SIVAL(p,0,mode); p += 4;
> 			q = p; p += 4; /* q is placeholder for name length. */
> 			{
> 				unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
>@@ -1760,7 +1757,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
> 			put_long_date_timespec(p,mdate_ts); p += 8;
> 			SOFF_T(p,0,file_size); p += 8;
> 			SOFF_T(p,0,allocation_size); p += 8;
>-			SIVAL(p,0,nt_extmode); p += 4;
>+			SIVAL(p,0,mode); p += 4;
> 			q = p; p += 4; /* q is placeholder for name length */
> 			{
> 				unsigned int ea_size = estimate_ea_size(conn, NULL, pathreal);
>@@ -4071,8 +4068,6 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
> 	} else {
> 		mode = dos_mode(conn,fname,&sbuf);
> 	}
>-	if (!mode)
>-		mode = FILE_ATTRIBUTE_NORMAL;
> 
> 	nlink = sbuf.st_nlink;
> 
>-- 
>1.6.0.4
>

Flags:

metze: review+

Actions: View

Attachments on bug 6875: 4923 | 4924 | 5088 | 5089