summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-01-17 06:37:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:56 -0500
commit31778ba8d2373d6d24b9633ab0f4902a5c5edc6a (patch)
treebfadfcde670bbb5defcabd59e44a40e6647f37a4 /source4
parentde7e4293ac13960a1f8857ad5297acaff11d0d5f (diff)
downloadsamba-31778ba8d2373d6d24b9633ab0f4902a5c5edc6a.tar.gz
samba-31778ba8d2373d6d24b9633ab0f4902a5c5edc6a.tar.bz2
samba-31778ba8d2373d6d24b9633ab0f4902a5c5edc6a.zip
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)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/eparser.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm
index b97857552f..02cc30c0aa 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