From 23803094e54c30c3c94d2fbca1d6077947867ace Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 21 Jun 2006 21:24:00 +0000
Subject: r16449: move some code to a generic place

metze
(This used to be commit 77a711c54ae7543a26f0ace1f189d6ed580c48d9)
---
 source4/smb_server/blob.c | 486 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 486 insertions(+)
 create mode 100644 source4/smb_server/blob.c

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
new file mode 100644
index 0000000000..832529a793
--- /dev/null
+++ b/source4/smb_server/blob.c
@@ -0,0 +1,486 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   Copyright (C) Andrew Tridgell 2003
+   Copyright (C) Stefan Metzmacher 2006
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "dlinklist.h"
+#include "smb_server/smb_server.h"
+#include "librpc/gen_ndr/ndr_misc.h"
+#include "ntvfs/ntvfs.h"
+#include "libcli/raw/libcliraw.h"
+
+#define BLOB_CHECK(cmd) do { \
+	NTSTATUS _status; \
+	_status = cmd; \
+	NT_STATUS_NOT_OK_RETURN(_status); \
+} while (0)
+
+/* grow the data size of a trans2 reply */
+NTSTATUS smbsrv_blob_grow_data(TALLOC_CTX *mem_ctx,
+			       DATA_BLOB *blob,
+			       uint32_t new_size)
+{
+	if (new_size > blob->length) {
+		uint8_t *p;
+		p = talloc_realloc(mem_ctx, blob->data, uint8_t, new_size);
+		NT_STATUS_HAVE_NO_MEMORY(p);
+		blob->data = p;
+	}
+	blob->length = new_size;
+	return NT_STATUS_OK;
+}
+
+/* grow the data, zero filling any new bytes */
+NTSTATUS smbsrv_blob_fill_data(TALLOC_CTX *mem_ctx,
+			       DATA_BLOB *blob,
+			       uint32_t new_size)
+{
+	uint32_t old_size = blob->length;
+	BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, new_size));
+	if (new_size > old_size) {
+		memset(blob->data + old_size, 0, new_size - old_size);
+	}
+	return NT_STATUS_OK;
+}
+
+/*
+  pull a string from a blob in a trans2 request
+*/
+size_t smbsrv_blob_pull_string(struct smbsrv_request *req, 
+			       const DATA_BLOB *blob,
+			       uint16_t offset,
+			       const char **str,
+			       int flags)
+{
+	*str = NULL;
+	/* we use STR_NO_RANGE_CHECK because the params are allocated
+	   separately in a DATA_BLOB, so we need to do our own range
+	   checking */
+	if (offset >= blob->length) {
+		return 0;
+	}
+	
+	return req_pull_string(req, str, 
+			       blob->data + offset, 
+			       blob->length - offset,
+			       STR_NO_RANGE_CHECK | flags);
+}
+
+/*
+  push a string into the data section of a trans2 request
+  return the number of bytes consumed in the output
+*/
+size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
+			       DATA_BLOB *blob,
+			       uint32_t len_offset,
+			       uint32_t offset,
+			       const char *str,
+			       int dest_len,
+			       int default_flags,
+			       int flags)
+{
+	int alignment = 0, ret = 0, pkt_len;
+
+	/* we use STR_NO_RANGE_CHECK because the params are allocated
+	   separately in a DATA_BLOB, so we need to do our own range
+	   checking */
+	if (!str || offset >= blob->length) {
+		if (flags & STR_LEN8BIT) {
+			SCVAL(blob->data, len_offset, 0);
+		} else {
+			SIVAL(blob->data, len_offset, 0);
+		}
+		return 0;
+	}
+
+	flags |= STR_NO_RANGE_CHECK;
+
+	if (dest_len == -1 || (dest_len > blob->length - offset)) {
+		dest_len = blob->length - offset;
+	}
+
+	if (!(flags & (STR_ASCII|STR_UNICODE))) {
+		flags |= default_flags;
+	}
+
+	if ((offset&1) && (flags & STR_UNICODE) && !(flags & STR_NOALIGN)) {
+		alignment = 1;
+		if (dest_len > 0) {
+			SCVAL(blob->data + offset, 0, 0);
+			ret = push_string(blob->data + offset + 1, str, dest_len-1, flags);
+		}
+	} else {
+		ret = push_string(blob->data + offset, str, dest_len, flags);
+	}
+
+	/* sometimes the string needs to be terminated, but the length
+	   on the wire must not include the termination! */
+	pkt_len = ret;
+
+	if ((flags & STR_LEN_NOTERM) && (flags & STR_TERMINATE)) {
+		if ((flags & STR_UNICODE) && ret >= 2) {
+			pkt_len = ret-2;
+		}
+		if ((flags & STR_ASCII) && ret >= 1) {
+			pkt_len = ret-1;
+		}
+	}
+
+	if (flags & STR_LEN8BIT) {
+		SCVAL(blob->data, len_offset, pkt_len);
+	} else {
+		SIVAL(blob->data, len_offset, pkt_len);
+	}
+
+	return ret + alignment;
+}
+
+/*
+  append a string to the data section of a trans2 reply
+  len_offset points to the place in the packet where the length field
+  should go
+*/
+NTSTATUS smbsrv_blob_append_string(TALLOC_CTX *mem_ctx,
+				   DATA_BLOB *blob,
+				   const char *str,
+				   uint_t len_offset,
+				   int default_flags,
+				   int flags)
+{
+	size_t ret;
+	uint32_t offset;
+	const int max_bytes_per_char = 3;
+
+	offset = blob->length;
+	BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, offset + (2+strlen_m(str))*max_bytes_per_char));
+	ret = smbsrv_blob_push_string(mem_ctx, blob, len_offset, offset, str, -1, default_flags, flags);
+	if (ret < 0) {
+		return NT_STATUS_FOOBAR;
+	}
+	BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, offset + ret));
+	return NT_STATUS_OK;
+}
+
+NTSTATUS smbsrv_push_passthru_fsinfo(TALLOC_CTX *mem_ctx,
+				     DATA_BLOB *blob,
+				     enum smb_fsinfo_level level,
+				     union smb_fsinfo *fsinfo,
+				     int default_str_flags)
+{
+	uint_t i;
+	DATA_BLOB guid_blob;
+
+	switch (level) {
+	case RAW_QFS_VOLUME_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 18));
+
+		push_nttime(blob->data, 0, fsinfo->volume_info.out.create_time);
+		SIVAL(blob->data,       8, fsinfo->volume_info.out.serial_number);
+		SSVAL(blob->data,      16, 0); /* padding */
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
+						     fsinfo->volume_info.out.volume_name.s,
+						     12, default_str_flags,
+						     STR_UNICODE));
+
+		return NT_STATUS_OK;
+
+	case RAW_QFS_SIZE_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 24));
+
+		SBVAL(blob->data,  0, fsinfo->size_info.out.total_alloc_units);
+		SBVAL(blob->data,  8, fsinfo->size_info.out.avail_alloc_units);
+		SIVAL(blob->data, 16, fsinfo->size_info.out.sectors_per_unit);
+		SIVAL(blob->data, 20, fsinfo->size_info.out.bytes_per_sector);
+
+		return NT_STATUS_OK;
+
+	case RAW_QFS_DEVICE_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 8));
+
+		SIVAL(blob->data,      0, fsinfo->device_info.out.device_type);
+		SIVAL(blob->data,      4, fsinfo->device_info.out.characteristics);
+
+		return NT_STATUS_OK;
+
+	case RAW_QFS_ATTRIBUTE_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 12));
+
+		SIVAL(blob->data, 0, fsinfo->attribute_info.out.fs_attr);
+		SIVAL(blob->data, 4, fsinfo->attribute_info.out.max_file_component_length);
+		/* this must not be null terminated or win98 gets
+		   confused!  also note that w2k3 returns this as
+		   unicode even when ascii is negotiated */
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
+						     fsinfo->attribute_info.out.fs_type.s,
+						     8, default_str_flags,
+						     STR_UNICODE));
+		return NT_STATUS_OK;
+
+
+	case RAW_QFS_QUOTA_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 48));
+
+		SBVAL(blob->data,   0, fsinfo->quota_information.out.unknown[0]);
+		SBVAL(blob->data,   8, fsinfo->quota_information.out.unknown[1]);
+		SBVAL(blob->data,  16, fsinfo->quota_information.out.unknown[2]);
+		SBVAL(blob->data,  24, fsinfo->quota_information.out.quota_soft);
+		SBVAL(blob->data,  32, fsinfo->quota_information.out.quota_hard);
+		SBVAL(blob->data,  40, fsinfo->quota_information.out.quota_flags);
+
+		return NT_STATUS_OK;
+
+
+	case RAW_QFS_FULL_SIZE_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 32));
+
+		SBVAL(blob->data,  0, fsinfo->full_size_information.out.total_alloc_units);
+		SBVAL(blob->data,  8, fsinfo->full_size_information.out.call_avail_alloc_units);
+		SBVAL(blob->data, 16, fsinfo->full_size_information.out.actual_avail_alloc_units);
+		SIVAL(blob->data, 24, fsinfo->full_size_information.out.sectors_per_unit);
+		SIVAL(blob->data, 28, fsinfo->full_size_information.out.bytes_per_sector);
+
+		return NT_STATUS_OK;
+
+	case RAW_QFS_OBJECTID_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 64));
+
+		BLOB_CHECK(ndr_push_struct_blob(&guid_blob, mem_ctx, 
+						&fsinfo->objectid_information.out.guid,
+						(ndr_push_flags_fn_t)ndr_push_GUID));
+		memcpy(blob->data, guid_blob.data, guid_blob.length);
+
+		for (i=0;i<6;i++) {
+			SBVAL(blob->data, 16 + 8*i, fsinfo->objectid_information.out.unknown[i]);
+		}
+
+		return NT_STATUS_OK;
+
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+
+	return NT_STATUS_INVALID_LEVEL;
+}
+
+NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
+				       DATA_BLOB *blob,
+				       enum smb_fileinfo_level level,
+				       union smb_fileinfo *st,
+				       int default_str_flags)
+{
+	uint_t i;
+	size_t list_size;
+
+	switch (level) {
+	case RAW_FILEINFO_BASIC_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 40));
+
+		push_nttime(blob->data,  0, st->basic_info.out.create_time);
+		push_nttime(blob->data,  8, st->basic_info.out.access_time);
+		push_nttime(blob->data, 16, st->basic_info.out.write_time);
+		push_nttime(blob->data, 24, st->basic_info.out.change_time);
+		SIVAL(blob->data,       32, st->basic_info.out.attrib);
+		SIVAL(blob->data,       36, 0); /* padding */
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_NETWORK_OPEN_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 56));
+
+		push_nttime(blob->data,  0, st->network_open_information.out.create_time);
+		push_nttime(blob->data,  8, st->network_open_information.out.access_time);
+		push_nttime(blob->data, 16, st->network_open_information.out.write_time);
+		push_nttime(blob->data, 24, st->network_open_information.out.change_time);
+		SBVAL(blob->data,       32, st->network_open_information.out.alloc_size);
+		SBVAL(blob->data,       40, st->network_open_information.out.size);
+		SIVAL(blob->data,       48, st->network_open_information.out.attrib);
+		SIVAL(blob->data,       52, 0); /* padding */
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_STANDARD_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 24));
+
+		SBVAL(blob->data,  0, st->standard_info.out.alloc_size);
+		SBVAL(blob->data,  8, st->standard_info.out.size);
+		SIVAL(blob->data, 16, st->standard_info.out.nlink);
+		SCVAL(blob->data, 20, st->standard_info.out.delete_pending);
+		SCVAL(blob->data, 21, st->standard_info.out.directory);
+		SSVAL(blob->data, 22, 0); /* padding */
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_ATTRIBUTE_TAG_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 8));
+
+		SIVAL(blob->data,  0, st->attribute_tag_information.out.attrib);
+		SIVAL(blob->data,  4, st->attribute_tag_information.out.reparse_tag);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_EA_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 4));
+
+		SIVAL(blob->data,  0, st->ea_info.out.ea_size);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_MODE_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 4));
+
+		SIVAL(blob->data,  0, st->mode_information.out.mode);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_ALIGNMENT_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 4));
+
+		SIVAL(blob->data,  0, 
+		      st->alignment_information.out.alignment_requirement);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_ACCESS_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 4));
+
+		SIVAL(blob->data,  0, st->access_information.out.access_flags);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_POSITION_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 8));
+
+		SBVAL(blob->data,  0, st->position_information.out.position);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_COMPRESSION_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 16));
+
+		SBVAL(blob->data,  0, st->compression_info.out.compressed_size);
+		SSVAL(blob->data,  8, st->compression_info.out.format);
+		SCVAL(blob->data, 10, st->compression_info.out.unit_shift);
+		SCVAL(blob->data, 11, st->compression_info.out.chunk_shift);
+		SCVAL(blob->data, 12, st->compression_info.out.cluster_shift);
+		SSVAL(blob->data, 13, 0); /* 3 bytes padding */
+		SCVAL(blob->data, 15, 0);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_INTERNAL_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 8));
+
+		SBVAL(blob->data,  0, st->internal_information.out.file_id);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_ALL_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 72));
+
+		push_nttime(blob->data,  0, st->all_info.out.create_time);
+		push_nttime(blob->data,  8, st->all_info.out.access_time);
+		push_nttime(blob->data, 16, st->all_info.out.write_time);
+		push_nttime(blob->data, 24, st->all_info.out.change_time);
+		SIVAL(blob->data,       32, st->all_info.out.attrib);
+		SIVAL(blob->data,       36, 0); /* padding */
+		SBVAL(blob->data,       40, st->all_info.out.alloc_size);
+		SBVAL(blob->data,       48, st->all_info.out.size);
+		SIVAL(blob->data,       56, st->all_info.out.nlink);
+		SCVAL(blob->data,       60, st->all_info.out.delete_pending);
+		SCVAL(blob->data,       61, st->all_info.out.directory);
+		SSVAL(blob->data,       62, 0); /* padding */
+		SIVAL(blob->data,       64, st->all_info.out.ea_size);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
+						     st->all_info.out.fname.s,
+						     68, default_str_flags,
+						     STR_UNICODE));
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_NAME_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 4));
+
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
+						     st->name_info.out.fname.s,
+						     0, default_str_flags,
+						     STR_UNICODE));
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_ALT_NAME_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 4));
+
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, 
+						     st->alt_name_info.out.fname.s,
+						     0, default_str_flags,
+						     STR_UNICODE));
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_STREAM_INFORMATION:
+		for (i=0;i<st->stream_info.out.num_streams;i++) {
+			uint32_t data_size = blob->length;
+			uint8_t *data;
+
+			BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, data_size + 24));
+			data = blob->data + data_size;
+			SBVAL(data,  8, st->stream_info.out.streams[i].size);
+			SBVAL(data, 16, st->stream_info.out.streams[i].alloc_size);
+			BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
+							     st->stream_info.out.streams[i].stream_name.s,
+							     data_size + 4, default_str_flags,
+							     STR_UNICODE));
+			if (i == st->stream_info.out.num_streams - 1) {
+				SIVAL(blob->data, data_size, 0);
+			} else {
+				BLOB_CHECK(smbsrv_blob_fill_data(mem_ctx, blob, (blob->length+7)&~7));
+				SIVAL(blob->data, data_size, 
+				      blob->length - data_size);
+			}
+		}
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_SMB2_ALL_EAS:
+		list_size = ea_list_size_chained(st->all_eas.out.num_eas,
+						 st->all_eas.out.eas);
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, list_size));
+
+		ea_put_list_chained(blob->data,
+				    st->all_eas.out.num_eas,
+				    st->all_eas.out.eas);
+		return NT_STATUS_OK;
+
+	case RAW_FILEINFO_SMB2_ALL_INFORMATION:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 0x64));
+
+		push_nttime(blob->data, 0x00, st->all_info2.out.create_time);
+		push_nttime(blob->data, 0x08, st->all_info2.out.access_time);
+		push_nttime(blob->data, 0x10, st->all_info2.out.write_time);
+		push_nttime(blob->data, 0x18, st->all_info2.out.change_time);
+		SIVAL(blob->data,       0x20, st->all_info2.out.attrib);
+		SIVAL(blob->data,       0x24, st->all_info2.out.unknown1);
+		SBVAL(blob->data,       0x28, st->all_info2.out.alloc_size);
+		SBVAL(blob->data,       0x30, st->all_info2.out.size);
+		SIVAL(blob->data,       0x38, st->all_info2.out.nlink);
+		SCVAL(blob->data,       0x3C, st->all_info2.out.delete_pending);
+		SCVAL(blob->data,       0x3D, st->all_info2.out.directory);
+		SBVAL(blob->data,	0x40, st->all_info2.out.file_id);
+		SIVAL(blob->data,       0x48, st->all_info2.out.ea_size);
+		SIVAL(blob->data,	0x4C, st->all_info2.out.access_mask);
+		SBVAL(blob->data,	0x50, st->all_info2.out.position);
+		SBVAL(blob->data,	0x58, st->all_info2.out.mode);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
+						     st->all_info.out.fname.s,
+						     0x60, default_str_flags,
+						     STR_UNICODE));
+		return NT_STATUS_OK;
+
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+
+	return NT_STATUS_INVALID_LEVEL;
+}
-- 
cgit 


From 15de59549baceb50762d9dd89228bb09e8d2c9c3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 22 Jun 2006 07:59:42 +0000
Subject: r16457: fix typo

metze
(This used to be commit 049ddc8a96da7a8fb0bbf1ef652c1963e9103d9b)
---
 source4/smb_server/blob.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 832529a793..d62067cdfd 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -473,7 +473,7 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 		SBVAL(blob->data,	0x50, st->all_info2.out.position);
 		SBVAL(blob->data,	0x58, st->all_info2.out.mode);
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
-						     st->all_info.out.fname.s,
+						     st->all_info2.out.fname.s,
 						     0x60, default_str_flags,
 						     STR_UNICODE));
 		return NT_STATUS_OK;
-- 
cgit 


From 70eac2a274063c76a3f0fa9504d2a1c30ee4b494 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 22 Jun 2006 17:33:56 +0000
Subject: r16466: for SMB2_ALL_EAS it's not valid for the ntvfs backends to
 return 0 eas, they should return an error: NO_EAS_ON_FILE or NO_MORE_EAS

metze
(This used to be commit fdefec1de99273978345d4a183a9660bd741e045)
---
 source4/smb_server/blob.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index d62067cdfd..6e798035a2 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -444,6 +444,15 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_OK;
 
 	case RAW_FILEINFO_SMB2_ALL_EAS:
+		/* if no eas are returned the backend should
+		 * have returned NO_EAS_ON_FILE or NO_MORE_EAS
+		 *
+		 * so it's a programmer error if num_eas == 0
+		 */
+		if (st->all_eas.out.num_eas == 0) {
+			smb_panic("0 eas for SMB2_ALL_EAS - programmer error in ntvfs backend");
+		}
+
 		list_size = ea_list_size_chained(st->all_eas.out.num_eas,
 						 st->all_eas.out.eas);
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, list_size));
-- 
cgit 


From f8d845446114cd138b908de71c2b989a32ea1508 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 28 Jun 2006 15:08:54 +0000
Subject: r16621: split out passthru levels of setfileinfo

metze
(This used to be commit 6cd64cb78f23c88029b8b5ef712b3f8a26e8528f)
---
 source4/smb_server/blob.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 6e798035a2..19d29edd84 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -32,6 +32,12 @@
 	NT_STATUS_NOT_OK_RETURN(_status); \
 } while (0)
 
+#define BLOB_CHECK_MIN_SIZE(blob, size) do { \
+	if ((blob)->length < (size)) { \
+		return NT_STATUS_INFO_LENGTH_MISMATCH; \
+	} \
+} while (0)
+
 /* grow the data size of a trans2 reply */
 NTSTATUS smbsrv_blob_grow_data(TALLOC_CTX *mem_ctx,
 			       DATA_BLOB *blob,
@@ -493,3 +499,84 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 
 	return NT_STATUS_INVALID_LEVEL;
 }
+
+NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
+					enum smb_setfileinfo_level level,
+					union smb_setfileinfo *st,
+					const DATA_BLOB *blob,
+					int default_str_flags,
+					struct smbsrv_request *req)
+{
+	uint32_t len;
+	DATA_BLOB str_blob;
+
+	switch (level) {
+	case SMB_SFILEINFO_BASIC_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 36);
+
+		st->basic_info.in.create_time = pull_nttime(blob->data,  0);
+		st->basic_info.in.access_time = pull_nttime(blob->data,  8);
+		st->basic_info.in.write_time =  pull_nttime(blob->data, 16);
+		st->basic_info.in.change_time = pull_nttime(blob->data, 24);
+		st->basic_info.in.attrib =      IVAL(blob->data,        32);
+
+		return NT_STATUS_OK;
+
+	case SMB_SFILEINFO_DISPOSITION_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 1);
+
+		st->disposition_info.in.delete_on_close = CVAL(blob->data, 0);
+
+		return NT_STATUS_OK;
+
+	case SMB_SFILEINFO_ALLOCATION_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 8);
+
+		st->allocation_info.in.alloc_size = BVAL(blob->data, 0);
+
+		return NT_STATUS_OK;				
+
+	case RAW_SFILEINFO_END_OF_FILE_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 8);
+
+		st->end_of_file_info.in.size = BVAL(blob->data, 0);
+
+		return NT_STATUS_OK;
+
+	case RAW_SFILEINFO_RENAME_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 12);
+
+		st->rename_information.in.overwrite = CVAL(blob->data, 0);
+		st->rename_information.in.root_fid  = IVAL(blob->data, 4);
+		len                                 = IVAL(blob->data, 8);
+		str_blob.data = blob->data+12;
+		str_blob.length = MIN(blob->length, len);
+		smbsrv_blob_pull_string(req, &str_blob, 0,
+					&st->rename_information.in.new_name,
+					STR_UNICODE);
+		if (st->rename_information.in.new_name == NULL) {
+			return NT_STATUS_FOOBAR;
+		}
+
+		return NT_STATUS_OK;
+
+	case RAW_SFILEINFO_POSITION_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 8);
+
+		st->position_information.in.position = BVAL(blob->data, 0);
+
+		return NT_STATUS_OK;
+
+	case RAW_SFILEINFO_MODE_INFORMATION:
+		BLOB_CHECK_MIN_SIZE(blob, 4);
+
+		st->mode_information.in.mode = IVAL(blob->data, 0);
+
+		return NT_STATUS_OK;
+
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+
+	return NT_STATUS_INVALID_LEVEL;
+}
-- 
cgit 


From 4015b0108831377404e7684a46bd709f3c6380b8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 29 Jun 2006 12:39:41 +0000
Subject: r16671: allow usage of smbsrv_pull_passthru_sfileinfo() without, a
 smbsrv_request given...

the RENAME level is not supported in this mode, but that will be fixed later

metze
(This used to be commit 058c6397a4018975f62e8277b905a2566c3b2fe0)
---
 source4/smb_server/blob.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 19d29edd84..4cf484f6a0 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -544,6 +544,13 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_OK;
 
 	case RAW_SFILEINFO_RENAME_INFORMATION:
+		if (!req) {
+			/* 
+			 * TODO: get rid of smbsrv_request argument of
+			 * smbsrv_blob_pull_string()
+			 */
+			return NT_STATUS_NOT_IMPLEMENTED;
+		}
 		BLOB_CHECK_MIN_SIZE(blob, 12);
 
 		st->rename_information.in.overwrite = CVAL(blob->data, 0);
-- 
cgit 


From fbf566b77719f77cbd8a6bcda1798b1b9b51ba16 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 5 Jul 2006 06:47:34 +0000
Subject: r16815: split out search levels which are also used by smb2

metze
(This used to be commit 3b8ecc19fac6f9d52adae86767ca153ab719d00d)
---
 source4/smb_server/blob.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 4cf484f6a0..07d1e0480d 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -587,3 +587,149 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 
 	return NT_STATUS_INVALID_LEVEL;
 }
+
+/*
+  fill a single entry in a trans2 find reply 
+*/
+NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
+				     DATA_BLOB *blob,
+				     enum smb_search_level level,
+				     union smb_search_data *file,
+				     int default_str_flags)
+{
+	uint8_t *data;
+	uint_t ofs = blob->length;
+
+	switch (level) {
+	case RAW_SEARCH_DIRECTORY_INFO:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 64));
+		data = blob->data + ofs;
+		SIVAL(data,          4, file->directory_info.file_index);
+		push_nttime(data,    8, file->directory_info.create_time);
+		push_nttime(data,   16, file->directory_info.access_time);
+		push_nttime(data,   24, file->directory_info.write_time);
+		push_nttime(data,   32, file->directory_info.change_time);
+		SBVAL(data,         40, file->directory_info.size);
+		SBVAL(data,         48, file->directory_info.alloc_size);
+		SIVAL(data,         56, file->directory_info.attrib);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->directory_info.name.s,
+						     ofs + 60, default_str_flags,
+						     STR_TERMINATE_ASCII));
+		data = blob->data + ofs;
+		SIVAL(data,          0, blob->length - ofs);
+		return NT_STATUS_OK;
+
+	case RAW_SEARCH_FULL_DIRECTORY_INFO:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 68));
+		data = blob->data + ofs;
+		SIVAL(data,          4, file->full_directory_info.file_index);
+		push_nttime(data,    8, file->full_directory_info.create_time);
+		push_nttime(data,   16, file->full_directory_info.access_time);
+		push_nttime(data,   24, file->full_directory_info.write_time);
+		push_nttime(data,   32, file->full_directory_info.change_time);
+		SBVAL(data,         40, file->full_directory_info.size);
+		SBVAL(data,         48, file->full_directory_info.alloc_size);
+		SIVAL(data,         56, file->full_directory_info.attrib);
+		SIVAL(data,         64, file->full_directory_info.ea_size);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->full_directory_info.name.s, 
+						     ofs + 60, default_str_flags,
+						     STR_TERMINATE_ASCII));
+		data = blob->data + ofs;
+		SIVAL(data,          0, blob->length - ofs);
+		return NT_STATUS_OK;
+
+	case RAW_SEARCH_NAME_INFO:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 12));
+		data = blob->data + ofs;
+		SIVAL(data,          4, file->name_info.file_index);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->name_info.name.s, 
+						     ofs + 8, default_str_flags,
+						     STR_TERMINATE_ASCII));
+		data = blob->data + ofs;
+		SIVAL(data,          0, blob->length - ofs);
+		return NT_STATUS_OK;
+
+	case RAW_SEARCH_BOTH_DIRECTORY_INFO:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 94));
+		data = blob->data + ofs;
+		SIVAL(data,          4, file->both_directory_info.file_index);
+		push_nttime(data,    8, file->both_directory_info.create_time);
+		push_nttime(data,   16, file->both_directory_info.access_time);
+		push_nttime(data,   24, file->both_directory_info.write_time);
+		push_nttime(data,   32, file->both_directory_info.change_time);
+		SBVAL(data,         40, file->both_directory_info.size);
+		SBVAL(data,         48, file->both_directory_info.alloc_size);
+		SIVAL(data,         56, file->both_directory_info.attrib);
+		SIVAL(data,         64, file->both_directory_info.ea_size);
+		SCVAL(data,         69, 0); /* reserved */
+		memset(data+70,0,24);
+		smbsrv_blob_push_string(mem_ctx, blob, 
+					68 + ofs, 70 + ofs, 
+					file->both_directory_info.short_name.s, 
+					24, default_str_flags,
+					STR_UNICODE | STR_LEN8BIT);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->both_directory_info.name.s, 
+						     ofs + 60, default_str_flags,
+						     STR_TERMINATE_ASCII));
+		/* align the end of the blob on an even boundary */
+		if (blob->length & 1) {
+			BLOB_CHECK(smbsrv_blob_fill_data(blob, blob, blob->length+1));
+		}
+		data = blob->data + ofs;
+		SIVAL(data,          0, blob->length - ofs);
+		return NT_STATUS_OK;
+
+	case RAW_SEARCH_ID_FULL_DIRECTORY_INFO:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 80));
+		data = blob->data + ofs;
+		SIVAL(data,          4, file->id_full_directory_info.file_index);
+		push_nttime(data,    8, file->id_full_directory_info.create_time);
+		push_nttime(data,   16, file->id_full_directory_info.access_time);
+		push_nttime(data,   24, file->id_full_directory_info.write_time);
+		push_nttime(data,   32, file->id_full_directory_info.change_time);
+		SBVAL(data,         40, file->id_full_directory_info.size);
+		SBVAL(data,         48, file->id_full_directory_info.alloc_size);
+		SIVAL(data,         56, file->id_full_directory_info.attrib);
+		SIVAL(data,         64, file->id_full_directory_info.ea_size);
+		SIVAL(data,         68, 0); /* padding */
+		SBVAL(data,         72, file->id_full_directory_info.file_id);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->id_full_directory_info.name.s, 
+						     ofs + 60, default_str_flags,
+						     STR_TERMINATE_ASCII));
+		data = blob->data + ofs;
+		SIVAL(data,          0, blob->length - ofs);
+		return NT_STATUS_OK;
+
+	case RAW_SEARCH_ID_BOTH_DIRECTORY_INFO:
+		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 104));
+		data = blob->data + ofs;
+		SIVAL(data,          4, file->id_both_directory_info.file_index);
+		push_nttime(data,    8, file->id_both_directory_info.create_time);
+		push_nttime(data,   16, file->id_both_directory_info.access_time);
+		push_nttime(data,   24, file->id_both_directory_info.write_time);
+		push_nttime(data,   32, file->id_both_directory_info.change_time);
+		SBVAL(data,         40, file->id_both_directory_info.size);
+		SBVAL(data,         48, file->id_both_directory_info.alloc_size);
+		SIVAL(data,         56, file->id_both_directory_info.attrib);
+		SIVAL(data,         64, file->id_both_directory_info.ea_size);
+		SCVAL(data,         69, 0); /* reserved */
+		memset(data+70,0,26);
+		smbsrv_blob_push_string(mem_ctx, blob, 
+					68 + ofs, 70 + ofs, 
+					file->id_both_directory_info.short_name.s, 
+					24, default_str_flags,
+					STR_UNICODE | STR_LEN8BIT);
+		SBVAL(data,         96, file->id_both_directory_info.file_id);
+		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->id_both_directory_info.name.s, 
+						     ofs + 60, default_str_flags,
+						     STR_TERMINATE_ASCII));
+		data = blob->data + ofs;
+		SIVAL(data,          0, blob->length - ofs);
+		return NT_STATUS_OK;
+
+	default:
+		return NT_STATUS_INVALID_LEVEL;
+	}
+
+	return NT_STATUS_INVALID_LEVEL;
+}
-- 
cgit 


From af0a9eb52955cfae570bfdc01821f56385c860cf Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 6 Jul 2006 08:00:24 +0000
Subject: r16834: split the level's of smb_search_first/smb_search_next and the
 levels of smb_search_data

metze
(This used to be commit 78c201db8a47a71908698c4dda2add4cf85694d9)
---
 source4/smb_server/blob.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 07d1e0480d..a456e04b34 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -593,7 +593,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 */
 NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 				     DATA_BLOB *blob,
-				     enum smb_search_level level,
+				     enum smb_search_data_level level,
 				     union smb_search_data *file,
 				     int default_str_flags)
 {
@@ -601,7 +601,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 	uint_t ofs = blob->length;
 
 	switch (level) {
-	case RAW_SEARCH_DIRECTORY_INFO:
+	case RAW_SEARCH_DATA_DIRECTORY_INFO:
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 64));
 		data = blob->data + ofs;
 		SIVAL(data,          4, file->directory_info.file_index);
@@ -619,7 +619,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
 
-	case RAW_SEARCH_FULL_DIRECTORY_INFO:
+	case RAW_SEARCH_DATA_FULL_DIRECTORY_INFO:
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 68));
 		data = blob->data + ofs;
 		SIVAL(data,          4, file->full_directory_info.file_index);
@@ -638,7 +638,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
 
-	case RAW_SEARCH_NAME_INFO:
+	case RAW_SEARCH_DATA_NAME_INFO:
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 12));
 		data = blob->data + ofs;
 		SIVAL(data,          4, file->name_info.file_index);
@@ -649,7 +649,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
 
-	case RAW_SEARCH_BOTH_DIRECTORY_INFO:
+	case RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO:
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 94));
 		data = blob->data + ofs;
 		SIVAL(data,          4, file->both_directory_info.file_index);
@@ -679,7 +679,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
 
-	case RAW_SEARCH_ID_FULL_DIRECTORY_INFO:
+	case RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO:
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 80));
 		data = blob->data + ofs;
 		SIVAL(data,          4, file->id_full_directory_info.file_index);
@@ -700,7 +700,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
 
-	case RAW_SEARCH_ID_BOTH_DIRECTORY_INFO:
+	case RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO:
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 104));
 		data = blob->data + ofs;
 		SIVAL(data,          4, file->id_both_directory_info.file_index);
-- 
cgit 


From bb158b74da65edc5ed8ed9fdbcb77ffae373df2e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 8 Jul 2006 08:18:55 +0000
Subject: r16871: zero padding bytes (found by valgrind)

metze
(This used to be commit 283bec8295b6302dfe3dc12c82d7870bdfee8b37)
---
 source4/smb_server/blob.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index a456e04b34..2cdf1aac05 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -482,6 +482,7 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 		SIVAL(blob->data,       0x38, st->all_info2.out.nlink);
 		SCVAL(blob->data,       0x3C, st->all_info2.out.delete_pending);
 		SCVAL(blob->data,       0x3D, st->all_info2.out.directory);
+		SSVAL(blob->data,       0x3E, 0); /* padding */
 		SBVAL(blob->data,	0x40, st->all_info2.out.file_id);
 		SIVAL(blob->data,       0x48, st->all_info2.out.ea_size);
 		SIVAL(blob->data,	0x4C, st->all_info2.out.access_mask);
-- 
cgit 


From 0329d755a7611ba3897fc1ee9bdce410cc33d7f8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 30 Aug 2006 11:29:34 +0000
Subject: r17930: Merge noinclude branch:  * Move dlinklist.h, smb.h to
 subsystem-specific directories  * Clean up ads.h and move what is left of it
 to dsdb/    (only place where it's used) (This used to be commit
 f7afa1cb77f3cfa7020b57de12e6003db7cfcc42)

---
 source4/smb_server/blob.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 2cdf1aac05..2fedc81678 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
-- 
cgit 


From d461f97a4acc36f9b98240cc6ce7e87a98fdd7cd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 23 Sep 2006 02:45:06 +0000
Subject: r18839: align all directory search blobs on an 8 byte boundary to
 keep the current vista release happy. (This used to be commit
 d3f0114a9dc8458cccfda71087668b1ddf4d380c)

---
 source4/smb_server/blob.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 2fedc81678..0b38d3901d 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -38,6 +38,15 @@
 	} \
 } while (0)
 
+
+/* align the end of the blob on an 8 byte boundary */
+#define BLOB_ALIGN(blob, alignment) do { \
+	if ((blob)->length & ((alignment)-1)) { \
+		uint8_t _pad = (alignment) - ((blob)->length & ((alignment)-1)); \
+		BLOB_CHECK(smbsrv_blob_fill_data(blob, blob, (blob)->length+_pad)); \
+	} \
+} while (0)
+
 /* grow the data size of a trans2 reply */
 NTSTATUS smbsrv_blob_grow_data(TALLOC_CTX *mem_ctx,
 			       DATA_BLOB *blob,
@@ -616,6 +625,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->directory_info.name.s,
 						     ofs + 60, default_str_flags,
 						     STR_TERMINATE_ASCII));
+		BLOB_ALIGN(blob, 8);
 		data = blob->data + ofs;
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
@@ -635,6 +645,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->full_directory_info.name.s, 
 						     ofs + 60, default_str_flags,
 						     STR_TERMINATE_ASCII));
+		BLOB_ALIGN(blob, 8);
 		data = blob->data + ofs;
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
@@ -646,6 +657,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->name_info.name.s, 
 						     ofs + 8, default_str_flags,
 						     STR_TERMINATE_ASCII));
+		BLOB_ALIGN(blob, 8);
 		data = blob->data + ofs;
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
@@ -672,10 +684,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->both_directory_info.name.s, 
 						     ofs + 60, default_str_flags,
 						     STR_TERMINATE_ASCII));
-		/* align the end of the blob on an even boundary */
-		if (blob->length & 1) {
-			BLOB_CHECK(smbsrv_blob_fill_data(blob, blob, blob->length+1));
-		}
+		BLOB_ALIGN(blob, 8);
 		data = blob->data + ofs;
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
@@ -697,6 +706,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->id_full_directory_info.name.s, 
 						     ofs + 60, default_str_flags,
 						     STR_TERMINATE_ASCII));
+		BLOB_ALIGN(blob, 8);
 		data = blob->data + ofs;
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
@@ -724,6 +734,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob, file->id_both_directory_info.name.s, 
 						     ofs + 60, default_str_flags,
 						     STR_TERMINATE_ASCII));
+		BLOB_ALIGN(blob, 8);
 		data = blob->data + ofs;
 		SIVAL(data,          0, blob->length - ofs);
 		return NT_STATUS_OK;
-- 
cgit 


From 42c1ef4025186066660b1bb187d063e07bb493ff Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 22 May 2007 09:25:58 +0000
Subject: r23067: use 'const union smb_search_data *file' also in the server
 code to get rid of compiler warnings in the cifs backend

metze
(This used to be commit 34ef07b1f5acdad27edd80de8de4c6de7f879f9b)
---
 source4/smb_server/blob.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 0b38d3901d..b28fcc4051 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -604,7 +604,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
 				     DATA_BLOB *blob,
 				     enum smb_search_data_level level,
-				     union smb_search_data *file,
+				     const union smb_search_data *file,
 				     int default_str_flags)
 {
 	uint8_t *data;
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/smb_server/blob.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index b28fcc4051..5cbd74a028 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -6,7 +6,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-- 
cgit 


From 529763a9aa192a6785ba878aceeb1683c2510913 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 9 Nov 2007 19:24:51 +0100
Subject: r25920: ndr: change NTSTAUS into enum ndr_err_code (samba4 callers)

lib/messaging/
lib/registry/
lib/ldb-samba/
librpc/rpc/
auth/auth_winbind.c
auth/gensec/
auth/kerberos/
dsdb/repl/
dsdb/samdb/
dsdb/schema/
torture/
cluster/ctdb/
kdc/
ntvfs/ipc/
torture/rap/
ntvfs/
utils/getntacl.c
ntptr/
smb_server/
libcli/wrepl/
wrepl_server/
libcli/cldap/
libcli/dgram/
libcli/ldap/
libcli/raw/
libcli/nbt/
libnet/
winbind/
rpc_server/

metze
(This used to be commit 6223c7fddc972687eb577e04fc1c8e0604c35435)
---
 source4/smb_server/blob.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 5cbd74a028..3683991526 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -272,12 +272,18 @@ NTSTATUS smbsrv_push_passthru_fsinfo(TALLOC_CTX *mem_ctx,
 
 		return NT_STATUS_OK;
 
-	case RAW_QFS_OBJECTID_INFORMATION:
+	case RAW_QFS_OBJECTID_INFORMATION: {
+		enum ndr_err_code ndr_err;
+
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 64));
 
-		BLOB_CHECK(ndr_push_struct_blob(&guid_blob, mem_ctx, 
-						&fsinfo->objectid_information.out.guid,
-						(ndr_push_flags_fn_t)ndr_push_GUID));
+		ndr_err = ndr_push_struct_blob(&guid_blob, mem_ctx,
+					       &fsinfo->objectid_information.out.guid,
+					       (ndr_push_flags_fn_t)ndr_push_GUID);
+		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			BLOB_CHECK(ndr_map_error2ntstatus(ndr_err));
+		}
+
 		memcpy(blob->data, guid_blob.data, guid_blob.length);
 
 		for (i=0;i<6;i++) {
@@ -285,7 +291,7 @@ NTSTATUS smbsrv_push_passthru_fsinfo(TALLOC_CTX *mem_ctx,
 		}
 
 		return NT_STATUS_OK;
-
+	}
 	default:
 		return NT_STATUS_INVALID_LEVEL;
 	}
-- 
cgit 


From 39ee38d9c1aabf4db065b433d067d0da053d7d61 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 6 Dec 2007 17:52:23 +0100
Subject: r26316: Use contexts for conversion functions. (This used to be
 commit f6420d933b5b011d428974f3a2a57edf19e6f482)

---
 source4/smb_server/blob.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 3683991526..237ebd4d7e 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -138,10 +138,10 @@ size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
 		alignment = 1;
 		if (dest_len > 0) {
 			SCVAL(blob->data + offset, 0, 0);
-			ret = push_string(blob->data + offset + 1, str, dest_len-1, flags);
+			ret = push_string(global_smb_iconv_convenience, blob->data + offset + 1, str, dest_len-1, flags);
 		}
 	} else {
-		ret = push_string(blob->data + offset, str, dest_len, flags);
+		ret = push_string(global_smb_iconv_convenience, blob->data + offset, str, dest_len, flags);
 	}
 
 	/* sometimes the string needs to be terminated, but the length
-- 
cgit 


From d891c0c74a03d797aed1c5ac0329fd9d1d78da63 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 13 Dec 2007 22:46:09 +0100
Subject: r26429: Avoid use of global_smb_iconv_convenience. (This used to be
 commit d37136b7abfbba75ef2e5ab855eb3382b9648b8c)

---
 source4/smb_server/blob.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 237ebd4d7e..21cddc4d7d 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
+#include "param/param.h"
 
 #define BLOB_CHECK(cmd) do { \
 	NTSTATUS _status; \
@@ -138,10 +139,10 @@ size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx,
 		alignment = 1;
 		if (dest_len > 0) {
 			SCVAL(blob->data + offset, 0, 0);
-			ret = push_string(global_smb_iconv_convenience, blob->data + offset + 1, str, dest_len-1, flags);
+			ret = push_string(lp_iconv_convenience(global_loadparm), blob->data + offset + 1, str, dest_len-1, flags);
 		}
 	} else {
-		ret = push_string(global_smb_iconv_convenience, blob->data + offset, str, dest_len, flags);
+		ret = push_string(lp_iconv_convenience(global_loadparm), blob->data + offset, str, dest_len, flags);
 	}
 
 	/* sometimes the string needs to be terminated, but the length
-- 
cgit 


From 86dc05e99f124db47f2743d1fc23117a7f5145ab Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 1 Jan 2008 22:05:05 -0600
Subject: r26638: libndr: Require explicitly specifying iconv_convenience for
 ndr_struct_push_blob(). (This used to be commit
 61ad78ac98937ef7a9aa32075a91a1c95b7606b3)

---
 source4/smb_server/blob.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 21cddc4d7d..2b870118ba 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -278,7 +278,7 @@ NTSTATUS smbsrv_push_passthru_fsinfo(TALLOC_CTX *mem_ctx,
 
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, 64));
 
-		ndr_err = ndr_push_struct_blob(&guid_blob, mem_ctx,
+		ndr_err = ndr_push_struct_blob(&guid_blob, mem_ctx, NULL, 
 					       &fsinfo->objectid_information.out.guid,
 					       (ndr_push_flags_fn_t)ndr_push_GUID);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-- 
cgit 


From e870cfec9f3512b0f1bd3110d7b975652525e28a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Feb 2008 10:12:33 +1100
Subject: Convert SMB and SMB2 code to use a common buffer handling structure

This converts our SMB and SMB2 code to use a common structure "struct
request_bufinfo" for information on the buffer bounds of a packet,
alignment information and string handling. This allows us to use a
common backend for SMB and SMB2 code, while still using all the same
string and blob handling functions.

Up to now we had been passing a NULL req handle into these common
routines from the SMB2 side of the server, which meant that we failed
any operation which did a bounds checked string extraction (such as a
RenameInformation setinfo call, which is what Vista uses for renaming
files)

There is still some more work to be done on this - for example we can
now remove many of the SMB2 specific buffer handling functions that we
had, and use the SMB ones.
(This used to be commit ca6d9be6cb6a403a81b18fa6e9a6a0518d7f0f68)
---
 source4/smb_server/blob.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 2b870118ba..caf6fb447d 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -78,7 +78,7 @@ NTSTATUS smbsrv_blob_fill_data(TALLOC_CTX *mem_ctx,
 /*
   pull a string from a blob in a trans2 request
 */
-size_t smbsrv_blob_pull_string(struct smbsrv_request *req, 
+size_t smbsrv_blob_pull_string(struct request_bufinfo *bufinfo, 
 			       const DATA_BLOB *blob,
 			       uint16_t offset,
 			       const char **str,
@@ -92,7 +92,7 @@ size_t smbsrv_blob_pull_string(struct smbsrv_request *req,
 		return 0;
 	}
 	
-	return req_pull_string(req, str, 
+	return req_pull_string(bufinfo, str, 
 			       blob->data + offset, 
 			       blob->length - offset,
 			       STR_NO_RANGE_CHECK | flags);
@@ -521,7 +521,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 					union smb_setfileinfo *st,
 					const DATA_BLOB *blob,
 					int default_str_flags,
-					struct smbsrv_request *req)
+					struct request_bufinfo *bufinfo)
 {
 	uint32_t len;
 	DATA_BLOB str_blob;
@@ -560,12 +560,8 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_OK;
 
 	case RAW_SFILEINFO_RENAME_INFORMATION:
-		if (!req) {
-			/* 
-			 * TODO: get rid of smbsrv_request argument of
-			 * smbsrv_blob_pull_string()
-			 */
-			return NT_STATUS_NOT_IMPLEMENTED;
+		if (!bufinfo) {
+			return NT_STATUS_INTERNAL_ERROR;
 		}
 		BLOB_CHECK_MIN_SIZE(blob, 12);
 
@@ -574,7 +570,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 		len                                 = IVAL(blob->data, 8);
 		str_blob.data = blob->data+12;
 		str_blob.length = MIN(blob->length, len);
-		smbsrv_blob_pull_string(req, &str_blob, 0,
+		smbsrv_blob_pull_string(bufinfo, &str_blob, 0,
 					&st->rename_information.in.new_name,
 					STR_UNICODE);
 		if (st->rename_information.in.new_name == NULL) {
-- 
cgit 


From 839ab724dc2d204bfbb0693aeed64f6f83a4266b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Feb 2008 12:30:31 +1100
Subject: Fixed SMB2 rename operations from Vista clients

We needed a flag in bufinfo to mark packets as SMB2, as it seems that
SMB2 uses a different format for the RenameInformation buffer than SMB
does

Also handle the fact that SMB2 clients give the full path to the
target file in the rename, not a relative path
(This used to be commit 52d7972d95ddc19d22a4187b4d4428a6c3ed32d5)
---
 source4/smb_server/blob.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index caf6fb447d..795e7ce585 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -523,7 +523,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 					int default_str_flags,
 					struct request_bufinfo *bufinfo)
 {
-	uint32_t len;
+	uint32_t len, ofs;
 	DATA_BLOB str_blob;
 
 	switch (level) {
@@ -563,14 +563,23 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 		if (!bufinfo) {
 			return NT_STATUS_INTERNAL_ERROR;
 		}
-		BLOB_CHECK_MIN_SIZE(blob, 12);
-
-		st->rename_information.in.overwrite = CVAL(blob->data, 0);
-		st->rename_information.in.root_fid  = IVAL(blob->data, 4);
-		len                                 = IVAL(blob->data, 8);
-		str_blob.data = blob->data+12;
-		str_blob.length = MIN(blob->length, len);
-		smbsrv_blob_pull_string(bufinfo, &str_blob, 0,
+		if (bufinfo->flags & BUFINFO_FLAG_SMB2) {
+			/* SMB2 uses a different format for rename information */
+			BLOB_CHECK_MIN_SIZE(blob, 20);
+			st->rename_information.in.overwrite = CVAL(blob->data, 0);
+			st->rename_information.in.root_fid  = BVAL(blob->data, 4);
+			len                                 = IVAL(blob->data,16);
+			ofs                                 = 20;			
+		} else {
+			BLOB_CHECK_MIN_SIZE(blob, 12);
+			st->rename_information.in.overwrite = CVAL(blob->data, 0);
+			st->rename_information.in.root_fid  = IVAL(blob->data, 4);
+			len                                 = IVAL(blob->data, 8);
+			ofs                                 = 12;
+		}
+		str_blob = *blob;
+		str_blob.length = MIN(str_blob.length, ofs+len);
+		smbsrv_blob_pull_string(bufinfo, &str_blob, ofs,
 					&st->rename_information.in.new_name,
 					STR_UNICODE);
 		if (st->rename_information.in.new_name == NULL) {
-- 
cgit 


From 4a04a5e620a4666fc123d04cb96ef391de72c469 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Feb 2008 14:54:21 +1100
Subject: A better way to handle the different format of RenameInformation in
 SMB2

We now define a separate info level RAW_SFILEINFO_RENAME_INFORMATION_SMB2
and set that level when handling SMB2 packets. This makes the parsers clearer.
(This used to be commit f6cdf3f1177f63d80be757f007eb15380839b4f5)
---
 source4/smb_server/blob.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 795e7ce585..8c813204f3 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -563,20 +563,32 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
 		if (!bufinfo) {
 			return NT_STATUS_INTERNAL_ERROR;
 		}
-		if (bufinfo->flags & BUFINFO_FLAG_SMB2) {
-			/* SMB2 uses a different format for rename information */
-			BLOB_CHECK_MIN_SIZE(blob, 20);
-			st->rename_information.in.overwrite = CVAL(blob->data, 0);
-			st->rename_information.in.root_fid  = BVAL(blob->data, 4);
-			len                                 = IVAL(blob->data,16);
-			ofs                                 = 20;			
-		} else {
-			BLOB_CHECK_MIN_SIZE(blob, 12);
-			st->rename_information.in.overwrite = CVAL(blob->data, 0);
-			st->rename_information.in.root_fid  = IVAL(blob->data, 4);
-			len                                 = IVAL(blob->data, 8);
-			ofs                                 = 12;
+		BLOB_CHECK_MIN_SIZE(blob, 12);
+		st->rename_information.in.overwrite = CVAL(blob->data, 0);
+		st->rename_information.in.root_fid  = IVAL(blob->data, 4);
+		len                                 = IVAL(blob->data, 8);
+		ofs                                 = 12;
+		str_blob = *blob;
+		str_blob.length = MIN(str_blob.length, ofs+len);
+		smbsrv_blob_pull_string(bufinfo, &str_blob, ofs,
+					&st->rename_information.in.new_name,
+					STR_UNICODE);
+		if (st->rename_information.in.new_name == NULL) {
+			return NT_STATUS_FOOBAR;
+		}
+
+		return NT_STATUS_OK;
+
+	case RAW_SFILEINFO_RENAME_INFORMATION_SMB2:
+		/* SMB2 uses a different format for rename information */
+		if (!bufinfo) {
+			return NT_STATUS_INTERNAL_ERROR;
 		}
+		BLOB_CHECK_MIN_SIZE(blob, 20);
+		st->rename_information.in.overwrite = CVAL(blob->data, 0);
+		st->rename_information.in.root_fid  = BVAL(blob->data, 8);
+		len                                 = IVAL(blob->data,16);
+		ofs                                 = 20;			
 		str_blob = *blob;
 		str_blob.length = MIN(str_blob.length, ofs+len);
 		smbsrv_blob_pull_string(bufinfo, &str_blob, ofs,
-- 
cgit 


From afe3e8172ddaa5e4aa811faceecda4f943d6e2ef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Apr 2008 04:53:27 +0200
Subject: Install public header files again and include required prototypes.
 (This used to be commit 47ffbbf67435904754469544390b67d34c958343)

---
 source4/smb_server/blob.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 8c813204f3..8834c4483c 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/raw/raw_proto.h"
 #include "param/param.h"
 
 #define BLOB_CHECK(cmd) do { \
-- 
cgit 


From dec930448f957aca7e70e975221a2ac060819b2e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 22 May 2008 14:49:21 +1000
Subject: fixed parsing of the SMB2 ALL_INFO qfileinfo level (This used to be
 commit a7be5ba22e0cf2c61501f5a05e64673f31ba145c)

---
 source4/smb_server/blob.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 8834c4483c..65cdd2aea6 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -503,7 +503,8 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 		SIVAL(blob->data,       0x48, st->all_info2.out.ea_size);
 		SIVAL(blob->data,	0x4C, st->all_info2.out.access_mask);
 		SBVAL(blob->data,	0x50, st->all_info2.out.position);
-		SBVAL(blob->data,	0x58, st->all_info2.out.mode);
+		SIVAL(blob->data,	0x58, st->all_info2.out.mode);
+		SIVAL(blob->data,	0x5C, st->all_info2.out.alignment_requirement);
 		BLOB_CHECK(smbsrv_blob_append_string(mem_ctx, blob,
 						     st->all_info2.out.fname.s,
 						     0x60, default_str_flags,
-- 
cgit 


From d5def936fe67c1cde2c4ed00834c4ce325dfcb55 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 22 May 2008 22:46:29 +1000
Subject: pass in the required alignment to the EA construction routines (This
 used to be commit af31030e0b78b6b220740529901ec8d2d9f5a3fe)

---
 source4/smb_server/blob.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index 65cdd2aea6..cea4c60e59 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -476,12 +476,12 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 		}
 
 		list_size = ea_list_size_chained(st->all_eas.out.num_eas,
-						 st->all_eas.out.eas);
+						 st->all_eas.out.eas, 8);
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, list_size));
 
 		ea_put_list_chained(blob->data,
 				    st->all_eas.out.num_eas,
-				    st->all_eas.out.eas);
+				    st->all_eas.out.eas, 8);
 		return NT_STATUS_OK;
 
 	case RAW_FILEINFO_SMB2_ALL_INFORMATION:
-- 
cgit 


From ec7a6ee8ab25f4550a68b286d9eba32b955a73a1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 23 May 2008 00:07:12 +1000
Subject: fix make test for EAs again

- go back to 4 byte alignment until I work out the rules that Vista
  wants more exactly
- add the zero sized EA handling for SMB2 more generically
(This used to be commit 326b69bc8064cbea357864cecd6bd27b50c57184)
---
 source4/smb_server/blob.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/smb_server/blob.c')

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index cea4c60e59..368b81d18e 100644
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -476,12 +476,12 @@ NTSTATUS smbsrv_push_passthru_fileinfo(TALLOC_CTX *mem_ctx,
 		}
 
 		list_size = ea_list_size_chained(st->all_eas.out.num_eas,
-						 st->all_eas.out.eas, 8);
+						 st->all_eas.out.eas, 4);
 		BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, list_size));
 
 		ea_put_list_chained(blob->data,
 				    st->all_eas.out.num_eas,
-				    st->all_eas.out.eas, 8);
+				    st->all_eas.out.eas, 4);
 		return NT_STATUS_OK;
 
 	case RAW_FILEINFO_SMB2_ALL_INFORMATION:
-- 
cgit