From fe72740e8221575921c22030d6d4fcb19201b03b Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
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 <rusty@rustcorp.com.au>
---
 source3/web/swat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1e676a5aec..90e4af9958 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -627,7 +627,7 @@ static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
 		   variable globally. We need to change the parameter in 
 		   all shares where it is currently set to the default */
 		for (i=0;i<lp_numservices();i++) {
-			s = lp_servicename(i);
+			s = lp_servicename(talloc_tos(), i);
 			if (s && (*s) && lp_is_default(i, parm)) {
 				lp_do_parameter(i, parm->label, v);
 			}
@@ -1112,7 +1112,7 @@ output_page:
 	if (snum < 0)
 		printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
-		s = lp_servicename(i);
+		s = lp_servicename(talloc_tos(), i);
 		if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
 			push_utf8_talloc(talloc_tos(), &utf8_s, s, &converted_size);
 			printf("<option %s value=\"%s\">%s\n", 
@@ -1469,7 +1469,7 @@ output_page:
 	if (snum < 0 || !lp_print_ok(snum))
 		printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
-		s = lp_servicename(i);
+		s = lp_servicename(talloc_tos(), i);
 		if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
                     if (i >= iNumNonAutoPrintServices)
                         printf("<option %s value=\"%s\">[*]%s\n",
-- 
cgit