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

2 files changed, 4 insertions, 34 deletions

diff --git a/source4/librpc/idl/dom_sid.idl b/source4/librpc/idl/dom_sid.idl
index 80df11dbfe..172dda4fae 100644
--- a/source4/librpc/idl/dom_sid.idl
+++ b/source4/librpc/idl/dom_sid.idl
@@ -1,42 +1,12 @@
-/*
-   use the same structure for dom_sid2 as dom_sid. A dom_sid2 is really
-   just a dom sid, but with the sub_auths represented as a conformant
-   array. As with all in-structure conformant arrays, the array length
-   is placed before the start of the structure. That's what gives rise
-   to the extra num_auths elemenent. We don't want the Samba code to
-   have to bother with such esoteric NDR details, so its easier to just
-   define it as a dom_sid and use pidl magic to make it all work. It
-   just means you need to mark a sid as a "dom_sid2" in the IDL when you
-   know it is of the conformant array variety
-*/
-cpp_quote("#define dom_sid2 dom_sid")
-
-/* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */
-cpp_quote("#define dom_sid28 dom_sid")
-
-/* same struct as dom_sid but in a variable byte buffer, which is maybe empty in NDR */
-cpp_quote("#define dom_sid0 dom_sid")
-
 [
 	pointer_default(unique)
 ]
 interface dom_sid
 {
-	/* a domain SID. Note that unlike Samba3 this contains a pointer,
-	   so you can't copy them using assignment */
-	typedef [public,gensize,noprint,noejs,nosize] struct {
-		uint8  sid_rev_num;             /**< SID revision number */
-		[range(0,15)] int8  num_auths;  /**< Number of sub-authorities */
-		uint8  id_auth[6];              /**< Identifier Authority */
-		uint32 sub_auths[num_auths];
-	} dom_sid;
-
 	/* id used to identify a endpoint, possibly in a cluster */
 	typedef [public] struct {
 		hyper id;
 		uint32 id2;
 		uint32 node;
 	} server_id;
-
 }
-
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index e3ea7e55e1..41787355a9 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -14,7 +14,7 @@ import "misc.idl", "security.idl", "nbt.idl";
 		IRPC_FLAG_REPLY    = 0x0001
 	} irpc_flags;
 
-	typedef [public,noejs] struct {
+	typedef [public] struct {
 		GUID uuid;
 		uint32 if_version;
 		uint32 callnum;
@@ -65,17 +65,17 @@ import "misc.idl", "security.idl", "nbt.idl";
 		[out,unique] astring *dcname
 		);
 
-	typedef [noejs] struct {
+	typedef struct {
 		ipv4address addr;
 	} nbtd_proxy_wins_addr;
 
-	[noejs] void nbtd_proxy_wins_challenge(
+	void nbtd_proxy_wins_challenge(
 		[in] nbt_name name,
 		[in,out] uint32 num_addrs,
 		[in,out] nbtd_proxy_wins_addr addrs[num_addrs]
 		);
 
-	[noejs] void nbtd_proxy_wins_release_demand(
+	void nbtd_proxy_wins_release_demand(
 		[in] nbt_name name,
 		[in] uint32 num_addrs,
 		[in] nbtd_proxy_wins_addr addrs[num_addrs]