r21949: After discussion with the Apple and Linux client maintainers,

changing the FindFirst response for the UNIX_INFO2 level to include
a length field before the name. The name is not required to be null
terminated. the lenght field does not count any null.
(This used to be commit eef672bfff6b112ceceec2a58c78042352e83276)

3 files changed, 18 insertions, 8 deletions

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index e4efab33750..4620baed789 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -2576,7 +2576,7 @@ union smb_search_data {
 		NTTIME create_time;
 		uint32_t file_flags;
 		uint32_t flags_mask;
-		const char *name;
+		struct smb_wire_string name;
 	} unix_info2;
 };
 
diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c
index 5abe19d50c4..3c7ca5788e0 100644
--- a/source4/libcli/raw/rawsearch.c
+++ b/source4/libcli/raw/rawsearch.c
@@ -607,7 +607,12 @@ static int parse_trans2_search(struct smbcli_tree *tree,
 		return ofs;
 
 	case RAW_SEARCH_DATA_UNIX_INFO2:
-		if (blob->length < (116 + 8 + 1)) {
+		/*   8 - size of ofs + file_index
+		 * 116 - size of unix_info2
+		 *   4 - size of name length
+		 *   2 - "." is the shortest name
+		 */
+		if (blob->length < (116 + 8 + 4 + 2)) {
 			return -1;
 		}
 
@@ -630,11 +635,16 @@ static int parse_trans2_search(struct smbcli_tree *tree,
 		data->unix_info2.file_flags	    = IVAL(blob->data, 116);
 		data->unix_info2.flags_mask	    = IVAL(blob->data, 120);
 
-		/* There is no length field for this name but we know it's null terminated. */
-		len = smbcli_blob_pull_unix_string(tree->session, mem_ctx, blob,
-					   &data->unix_info2.name, 116 + 8, 0);
+		/* There is a 4 byte length field for this name. The length
+		 * does not include the NULL terminator.
+		 */
+		len = smbcli_blob_pull_string(tree->session, mem_ctx, blob,
+				       &data->unix_info2.name,
+				       8 + 116, /* offset to length */
+				       8 + 116 + 4, /* offset to string */
+				       0);
 
-		if (ofs != 0 && ofs < (116 + 8 + len)) {
+		if (ofs != 0 && ofs < (8 + 116 + 4 + len)) {
 			return -1;
 		}
 
diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c
index 66ec96bfd96..8c642c1d8df 100644
--- a/source4/torture/unix/unix_info2.c
+++ b/source4/torture/unix/unix_info2.c
@@ -298,7 +298,7 @@ static BOOL verify_setinfo_flags(void *mem_ctx,
 		if (info2.file_flags & smb_fmask) {
 			torture_assert_ntstatus_equal(torture,
 					status, NT_STATUS_OK,
-					"setting UNIX_INFO2 flags");
+					"setting valid UNIX_INFO2 flag");
 
 			if (!query_path_info2(mem_ctx, torture, cli,
 						fname, &info2)) {
@@ -314,7 +314,7 @@ static BOOL verify_setinfo_flags(void *mem_ctx,
 			 */
 			torture_assert_ntstatus_equal(torture,
 					status, NT_STATUS_INVALID_PARAMETER,
-					"setting UNIX_INFO2 flags");
+					"setting invalid UNIX_INFO2 flag");
 		}
 	}