Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 60 insertions, 3 deletions

diff --git a/source3/librpc/gen_ndr/xattr.h b/source3/librpc/gen_ndr/xattr.h
index b0b9db99c1..1d8da3f5e2 100644
--- a/source3/librpc/gen_ndr/xattr.h
+++ b/source3/librpc/gen_ndr/xattr.h
@@ -2,18 +2,75 @@
 
 #include <stdint.h>
 
+#include "librpc/gen_ndr/security.h"
 #ifndef _HEADER_xattr
 #define _HEADER_xattr
 
+#define XATTR_DOSATTRIB_NAME	( "user.DosAttrib" )
+#define XATTR_DOSATTRIB_ESTIMATED_SIZE	( 64 )
+#define XATTR_DOSEAS_NAME	( "user.DosEAs" )
+#define XATTR_DOSSTREAMS_NAME	( "user.DosStreams" )
+#define XATTR_STREAM_FLAG_INTERNAL	( 0x00000001 )
+#define XATTR_DOSSTREAM_PREFIX	( "user.DosStream." )
+#define XATTR_MAX_STREAM_SIZE	( 0x4000 )
+#define XATTR_MAX_STREAM_SIZE_TDB	( 0x100000 )
 #define XATTR_NTACL_NAME	( "security.NTACL" )
-struct tdb_xattr {
+struct xattr_DosInfo1 {
+	uint32_t attrib;
+	uint32_t ea_size;
+	uint64_t size;
+	uint64_t alloc_size;
+	NTTIME create_time;
+	NTTIME change_time;
+};
+
+struct xattr_DosInfo2Old {
+	uint32_t flags;
+	uint32_t attrib;
+	uint32_t ea_size;
+	uint64_t size;
+	uint64_t alloc_size;
+	NTTIME create_time;
+	NTTIME change_time;
+	NTTIME write_time;
+	const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
+};
+
+union xattr_DosInfo {
+	struct xattr_DosInfo1 info1;/* [case] */
+	struct xattr_DosInfo2Old oldinfo2;/* [case(2)] */
+}/* [switch_type(uint16)] */;
+
+struct xattr_DosAttrib {
+	uint16_t version;
+	union xattr_DosInfo info;/* [switch_is(version)] */
+}/* [public] */;
+
+struct xattr_EA {
 	const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
 	DATA_BLOB value;
+};
+
+struct xattr_DosEAs {
+	uint16_t num_eas;
+	struct xattr_EA *eas;/* [unique,size_is(num_eas)] */
 }/* [public] */;
 
 struct tdb_xattrs {
-	uint32_t num_xattrs;
-	struct tdb_xattr *xattrs;
+	uint32_t num_eas;
+	struct xattr_EA *eas;
+}/* [public] */;
+
+struct xattr_DosStream {
+	uint32_t flags;
+	uint64_t size;
+	uint64_t alloc_size;
+	const char * name;/* [flag(LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM)] */
+};
+
+struct xattr_DosStreams {
+	uint32_t num_streams;
+	struct xattr_DosStream *streams;/* [unique,size_is(num_streams)] */
 }/* [public] */;
 
 struct security_descriptor_timestamp {