summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-08-31 10:06:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:25 -0500
commit464227599ef62818796df24a175c4843d33f768f (patch)
treee85565b9030440d0ff348a816500eb0117d2bbf9 /source3
parent018f72aa9c55b5776d3e6b22591af6d7ee52eec9 (diff)
downloadsamba-464227599ef62818796df24a175c4843d33f768f.tar.gz
samba-464227599ef62818796df24a175c4843d33f768f.tar.bz2
samba-464227599ef62818796df24a175c4843d33f768f.zip
r24828: Give smbcontrol an initial talloc stackframe.
(This used to be commit 55020b07b5568104091352fd3ae21e2b29e34501)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/smbcontrol.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index e3358b1eff..2a435945e6 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1256,6 +1256,8 @@ int main(int argc, const char **argv)
POPT_COMMON_SAMBA
POPT_TABLEEND
};
+ TALLOC_CTX *frame = talloc_stackframe();
+ int ret = 0;
load_case_tables();
@@ -1305,8 +1307,11 @@ int main(int argc, const char **argv)
if (!(evt_ctx = event_context_init(NULL)) ||
!(msg_ctx = messaging_init(NULL, server_id_self(), evt_ctx))) {
fprintf(stderr, "could not init messaging context\n");
+ TALLOC_FREE(frame);
exit(1);
}
- return !do_command(msg_ctx, argc, argv);
+ ret = !do_command(msg_ctx, argc, argv);
+ TALLOC_FREE(frame);
+ return ret;
}