Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

It seems the format of main.mk changed in my sleep...

Conflicts:

	source/main.mk
(This used to be commit 56f2288e4f4f1aa70d11fc5f118458baf5803627)

4 files changed, 12 insertions, 14 deletions

diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
index 5ea37f1ac1..bf1e318674 100644
--- a/source4/librpc/idl/echo.idl
+++ b/source4/librpc/idl/echo.idl
@@ -38,7 +38,7 @@ interface rpcecho
 
 
 	/* test some alignment issues */
-	typedef struct {
+	typedef [public] struct {
 		uint8 v;
 	} echo_info1;
 
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index 783f04eb42..a6d0245455 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -73,11 +73,11 @@ interface nbt
 		nbt_name_type type;
 	} nbt_name;
 
-	typedef [enum16bit] enum {
+	typedef [public,enum16bit] enum {
 		NBT_QCLASS_IP = 0x01
 	} nbt_qclass;
 
-	typedef [enum16bit] enum {
+	typedef [public,enum16bit] enum {
 		NBT_QTYPE_ADDRESS     = 0x0001,
 		NBT_QTYPE_NAMESERVICE = 0x0002,
 		NBT_QTYPE_NULL        = 0x000A,
@@ -160,30 +160,24 @@ interface nbt
 		uint8  data[length];
 	} nbt_rdata_data;
 
-	typedef [nodiscriminant] union {
+	typedef [nodiscriminant,public] union {
 		[case(NBT_QTYPE_NETBIOS)] nbt_rdata_netbios netbios;
 		[case(NBT_QTYPE_STATUS)]  nbt_rdata_status status;
 		[default]                 nbt_rdata_data   data;
 	} nbt_rdata;
 
 /*
- * this macro works arround the problem
+ * this macro works around the problem
  * that we need to use nbt_rdata_data
  * together with NBT_QTYPE_NETBIOS
  * for WACK replies
  */
-#define NBT_RES_REC_LEVEL(rr_type, rdata) (\
-	(((rr_type) == NBT_QTYPE_NETBIOS) && \
-	talloc_check_name(ndr, "struct ndr_push") && \
-	((rdata).data.length == 2)) \
-	? 0 : rr_type)
-
-	typedef [flag(LIBNDR_PRINT_ARRAY_HEX)] struct {
+	typedef [flag(LIBNDR_PRINT_ARRAY_HEX),nopush] struct {
 		nbt_name   name;
 		nbt_qtype  rr_type;
 		nbt_qclass rr_class;
 		uint32     ttl;
-		[switch_is(NBT_RES_REC_LEVEL(rr_type, rdata))] nbt_rdata rdata;
+		[switch_is(rr_type)] nbt_rdata rdata;
 	} nbt_res_rec;
 
 	typedef [flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX),public] struct {
diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl
index 314846c53f..f8e9e9e110 100644
--- a/source4/librpc/idl/security.idl
+++ b/source4/librpc/idl/security.idl
@@ -106,6 +106,9 @@ interface security
 	const int SEC_ADS_LIST_OBJECT      = 0x00000080;
 	const int SEC_ADS_CONTROL_ACCESS   = 0x00000100;
 
+	/* invalid bits */
+	const int SEC_MASK_INVALID         = 0x0ce0fe00;
+
 	/* generic->specific mappings for files */
 	const int SEC_RIGHTS_FILE_READ    = SEC_STD_READ_CONTROL | 
 	                                    SEC_STD_SYNCHRONIZE | 
diff --git a/source4/librpc/idl/xattr.idl b/source4/librpc/idl/xattr.idl
index 2010d51ce1..520341e6aa 100644
--- a/source4/librpc/idl/xattr.idl
+++ b/source4/librpc/idl/xattr.idl
@@ -86,7 +86,8 @@ interface xattr
 	/* stream data is stored in attributes with the given prefix */
 	const char *XATTR_DOSSTREAM_PREFIX = "user.DosStream.";
 
-	const int XATTR_MAX_STREAM_SIZE = 0x4000;
+	const int XATTR_MAX_STREAM_SIZE     = 0x4000;
+	const int XATTR_MAX_STREAM_SIZE_TDB = 0x100000;
 
 	typedef struct {
 		uint32     flags;