summaryrefslogtreecommitdiff
path: root/source4/pidl/lib/Parse
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 13:10:11 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 13:10:11 +0100
commite4165448d778db1721b1c7670b25ae3e40917d86 (patch)
tree027b825fa742c1dbb97874c179cdeea6dba92a58 /source4/pidl/lib/Parse
parentcac225ba7daf8d88d858292902480415f0fa00e2 (diff)
parentde03c4a3eadd8180e5bda5b176f1abebff613a15 (diff)
downloadsamba-e4165448d778db1721b1c7670b25ae3e40917d86.tar.gz
samba-e4165448d778db1721b1c7670b25ae3e40917d86.tar.bz2
samba-e4165448d778db1721b1c7670b25ae3e40917d86.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
(This used to be commit 35f5c8294e9f3b304987597d4bcfc75fdda05982)
Diffstat (limited to 'source4/pidl/lib/Parse')
-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 "}";