r5007: Fix bug in regexp where we were eating the strings "in" or "out" from

structure names if they started with those strings.
(This used to be commit e983de6ead6ed23b51c2df70e69586b1e7be5a60)

diff --git a/source4/build/pidl/eparser.pm b/source4/build/pidl/eparser.pm
index cf2f6a4d54a23161115b6a636d19be2e226ebdd1..25b09febb880700482e9068317265b7ff6fe5a05 100644 (file)
--- a/source4/build/pidl/eparser.pm
+++ b/source4/build/pidl/eparser.pm
@@ -698,8 +698,8 @@ sub RewriteC($$$)
            s/(ndr_pull_([^\)]*?)\(
               ndr,\ 
               (NDR_[^,]*?),\ 
-              (&?r->(in|out|)\.?([^\(].*?))\);)
-               /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$6\", ndr, ett_$2), $4);
+              (&?r->((in|out)\.)?([^\(].*?))\);)
+               /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$7\", ndr, ett_$2), $4);
            /smgx;
        }
 
@@ -709,7 +709,7 @@ sub RewriteC($$$)
            s/(ndr_pull_([^\)]*?)\(
               ndr,\ 
               (NDR_[^,]*?),\ 
-              (&?r->(in|out|)\.?([^\(].*?))\);)
+              (&?r->((in|out)\.)?([^\(].*?))\);)
                /ndr_pull_$2(ndr, $3, get_subtree(tree, \"$2\", ndr, ett_$2), $4);
            /smgx;
        }