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/winbindd/idmap_ldap.c | 2 +- source3/winbindd/winbindd.c | 8 ++++---- source3/winbindd/winbindd_dual.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index 4f1dc8c7f4..aeeb2e87d0 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -471,7 +471,7 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom) tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL); if ( ! tmp || ! *tmp) { - tmp = lp_ldap_idmap_suffix(); + tmp = lp_ldap_idmap_suffix(talloc_tos()); if ( ! tmp) { DEBUG(1, ("ERROR: missing idmap ldap suffix\n")); ret = NT_STATUS_UNSUCCESSFUL; diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 1b6f4251b9..fe6e34b4b9 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -65,7 +65,7 @@ static bool reload_services_file(const char *lfile) bool ret; if (lp_loaded()) { - char *fname = lp_configfile(); + char *fname = lp_configfile(talloc_tos()); if (file_exist(fname) && !strcsequal(fname,get_dyn_CONFIGFILE())) { set_dyn_CONFIGFILE(fname); @@ -1297,7 +1297,7 @@ int main(int argc, char **argv, char **envp) CatchSignal(SIGUSR2, SIG_IGN); fault_setup(); - dump_core_setup("winbindd", lp_logfile()); + dump_core_setup("winbindd", lp_logfile(talloc_tos())); load_case_tables(); @@ -1357,7 +1357,7 @@ int main(int argc, char **argv, char **envp) * is often not related to the path where winbindd is actually run * in production. */ - dump_core_setup("winbindd", lp_logfile()); + dump_core_setup("winbindd", lp_logfile(talloc_tos())); if (is_daemon && interactive) { d_fprintf(stderr,"\nERROR: " "Option -i|--interactive is not allowed together with -D|--daemon\n\n"); @@ -1401,7 +1401,7 @@ int main(int argc, char **argv, char **envp) * as the log file might have been set in the configuration and cores's * path is by default basename(lp_logfile()). */ - dump_core_setup("winbindd", lp_logfile()); + dump_core_setup("winbindd", lp_logfile(talloc_tos())); /* Initialise messaging system */ diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 4eef550b4b..0e9bea123e 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -455,10 +455,10 @@ void setup_child(struct winbindd_domain *domain, struct winbindd_child *child, if (logprefix && logname) { char *logbase = NULL; - if (*lp_logfile()) { + if (*lp_logfile(talloc_tos())) { char *end = NULL; - if (asprintf(&logbase, "%s", lp_logfile()) < 0) { + if (asprintf(&logbase, "%s", lp_logfile(talloc_tos())) < 0) { smb_panic("Internal error: asprintf failed"); } -- cgit