From 31778ba8d2373d6d24b9633ab0f4902a5c5edc6a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 17 Jan 2005 06:37:47 +0000
Subject: [PATCH] r4798: When dissecting structures, name the protocol tree
 after the field name, not the field type (i.e DACL and SACL instead of
 dom_sid). (This used to be commit 2c0e77869f9f04a75785990c79e611134643f89e)

---
 source4/build/pidl/eparser.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm
index b97857552fe..02cc30c0aac 100644
--- a/source4/build/pidl/eparser.pm
+++ b/source4/build/pidl/eparser.pm
@@ -592,8 +592,8 @@ sub RewriteC($$$)
 	s/(ndr_pull_([^\)]*?)\(
 	   ndr,\ 
 	   (NDR_[^,]*?),\ 
-	   ([^\(].*?)\);)
-	    /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$2\", ndr, ett_$2), $4);
+	   (&?r->(in|out|)\.?([^\(].*?))\);)
+	    /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$6\", ndr, ett_$2), $4);
 	/smgx;
 
 	# Add proto_tree parameter to pull function prototypes, e.g
-- 
2.11.4.GIT