summaryrefslogtreecommitdiff
path: root/source4/pidl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 13:26:59 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 13:26:59 +0100
commita19534d2072ca7dc4c70767d02db58503678cfaa (patch)
tree03541a126783dbdbabfdabebe7ae78c48bfe5075 /source4/pidl
parente0a5fb8a9be9f3002d6f73c272793a75fa71d313 (diff)
parentaf007e5837ac472f0527505c8013b837932136bc (diff)
downloadsamba-a19534d2072ca7dc4c70767d02db58503678cfaa.tar.gz
samba-a19534d2072ca7dc4c70767d02db58503678cfaa.tar.bz2
samba-a19534d2072ca7dc4c70767d02db58503678cfaa.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit eff9c9cedd7410c3c089d090e3f83f8cc10f1831)
Diffstat (limited to 'source4/pidl')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index ca9e7d15db..4af9da0f52 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -100,7 +100,7 @@ sub ParseFunction($$)
pidl "";
pidl "call = &ndr_table_$if->{NAME}.calls[$op];";
pidl "";
- pidl "r = talloc(NULL, struct $fn->{NAME});";
+ pidl "r = talloc(talloc_tos(), struct $fn->{NAME});";
pidl "if (r == NULL) {";
pidl "\treturn false;";
pidl "}";