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/param/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/param/service.c') diff --git a/source3/param/service.c b/source3/param/service.c index f0cec4e216..5f0910fe0a 100644 --- a/source3/param/service.c +++ b/source3/param/service.c @@ -189,7 +189,7 @@ int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) } /* Is it a usershare service ? */ - if (iService < 0 && *lp_usershare_path()) { + if (iService < 0 && *lp_usershare_path(talloc_tos())) { /* Ensure the name is canonicalized. */ strlower_m(*p_service_out); iService = load_usershare_service(*p_service_out); @@ -197,7 +197,7 @@ int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) /* just possibly it's a default service? */ if (iService < 0) { - char *pdefservice = lp_defaultservice(); + char *pdefservice = lp_defaultservice(talloc_tos()); if (pdefservice && *pdefservice && !strequal(pdefservice, *p_service_out) -- cgit