From fe72740e8221575921c22030d6d4fcb19201b03b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 18 Jul 2012 15:07:23 +0930 Subject: loadparm: make the source3/ lp_ functions take an explicit TALLOC_CTX *. They use talloc_tos() internally: hoist that up to the callers, some of whom don't want to us talloc_tos(). A simple patch, but hits a lot of files. Signed-off-by: Rusty Russell --- source3/smbd/process.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source3/smbd/process.c') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 80b0c1d79b..adb773d749 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3456,16 +3456,17 @@ void smbd_process(struct tevent_context *ev_ctx, exit_server("Could not open account policy tdb.\n"); } - if (*lp_rootdir()) { - if (chroot(lp_rootdir()) != 0) { - DEBUG(0,("Failed to change root to %s\n", lp_rootdir())); + if (*lp_rootdir(talloc_tos())) { + if (chroot(lp_rootdir(talloc_tos())) != 0) { + DEBUG(0,("Failed to change root to %s\n", + lp_rootdir(talloc_tos()))); exit_server("Failed to chroot()"); } if (chdir("/") == -1) { - DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_rootdir())); + DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_rootdir(talloc_tos()))); exit_server("Failed to chroot()"); } - DEBUG(0,("Changed root to %s\n", lp_rootdir())); + DEBUG(0,("Changed root to %s\n", lp_rootdir(talloc_tos()))); } if (!srv_init_signing(sconn)) { -- cgit