mirror of
https://github.com/samba-team/samba.git
synced 2025-09-11 09:44:19 +03:00
r5007: Fix bug in regexp where we were eating the strings "in" or "out" from
structure names if they started with those strings.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
a34212247b
commit
e983de6ead
@@ -698,8 +698,8 @@ sub RewriteC($$$)
|
|||||||
s/(ndr_pull_([^\)]*?)\(
|
s/(ndr_pull_([^\)]*?)\(
|
||||||
ndr,\
|
ndr,\
|
||||||
(NDR_[^,]*?),\
|
(NDR_[^,]*?),\
|
||||||
(&?r->(in|out|)\.?([^\(].*?))\);)
|
(&?r->((in|out)\.)?([^\(].*?))\);)
|
||||||
/ndr_pull_$2(ndr, $3, get_subtree(tree, \"$6\", ndr, ett_$2), $4);
|
/ndr_pull_$2(ndr, $3, get_subtree(tree, \"$7\", ndr, ett_$2), $4);
|
||||||
/smgx;
|
/smgx;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -709,7 +709,7 @@ sub RewriteC($$$)
|
|||||||
s/(ndr_pull_([^\)]*?)\(
|
s/(ndr_pull_([^\)]*?)\(
|
||||||
ndr,\
|
ndr,\
|
||||||
(NDR_[^,]*?),\
|
(NDR_[^,]*?),\
|
||||||
(&?r->(in|out|)\.?([^\(].*?))\);)
|
(&?r->((in|out)\.)?([^\(].*?))\);)
|
||||||
/ndr_pull_$2(ndr, $3, get_subtree(tree, \"$2\", ndr, ett_$2), $4);
|
/ndr_pull_$2(ndr, $3, get_subtree(tree, \"$2\", ndr, ett_$2), $4);
|
||||||
/smgx;
|
/smgx;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user