From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 25 Aug 2010 09:16:52 +0000 (+0200)
Subject: Revert "pidl hacks"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=f9ecb7b87f99f4bbd6e13a2f0d3bd9b4facf2d16

Revert "pidl hacks"

This reverts commit 4d017f0f965a5bba760f2039bf0920bc9b609c72.
---

diff --git a/librpc/build_idl.sh b/librpc/build_idl.sh
index ca831c47a364..c335557d870d 100755
--- a/librpc/build_idl.sh
+++ b/librpc/build_idl.sh
@@ -7,7 +7,7 @@ else
 	FULL=0
 fi
 
-ARGS="--outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header --dump-ndr-tree $PIDL_ARGS --"
+ARGS="--outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header $PIDL_ARGS --"
 IDL_FILES="$*"
 
 oldpwd=`pwd`
diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index 74ab0716a383..d977ddd42756 100644
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -535,11 +535,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 	NTSTATUS samr_GetAliasMembership(
 		[in,ref]      policy_handle *domain_handle,
 		[in,ref]      lsa_SidArray  *sids,
-		[out,ref]     samr_Ids *rids,
-		[in,out,ref] uint16 *size,
-		[in,out,ref] uint16 *len,
-		[out,ref,size_is(*size),length_is(*len), charset(UTF16)] uint16 *bla,
-		[in,out,ref,string,charset(UTF16)] uint16 *metze
+		[out,ref]     samr_Ids *rids
 		);
 
 	/************************/
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 5cb1c8290c55..bd2616a7993c 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -758,7 +758,6 @@ sub ParseFunction($$$)
 			} elsif ($e->{LEVELS}[1]->{TYPE} eq "ARRAY" and
 				 $e->{LEVELS}[1]->{IS_ZERO_TERMINATED}) {
 				next;
-				$reason = "is a pointer to an unsized array";
 			} elsif ($e->{LEVELS}[1]->{TYPE} eq "ARRAY" and
 				 not defined($e->{LEVELS}[1]->{SIZE_IS})) {
 				$reason = "is a pointer to an unsized array";
diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 6c6a5f8ada9f..8f885887654b 100755
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -7,7 +7,7 @@ else
 	FULL=0
 fi
 
-ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client --dump-ndr-tree $PIDL_ARGS --"
+ARGS="--includedir=../librpc/idl --outputdir $PIDL_OUTPUTDIR --header --ndr-parser --samba3-ndr-server --samba3-ndr-client $PIDL_ARGS --"
 IDL_FILES="$*"
 
 oldpwd=`pwd`