diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-18 15:07:23 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-18 15:07:23 +0930 |
| commit | fe72740e8221575921c22030d6d4fcb19201b03b (patch) | |
| tree | 0b1bb254e23d6541eede8f2ff4494af477fd5566 /source3/winbindd/winbindd.c | |
| parent | c809eec53fb1d2a36909e4934dff349f91e3359e (diff) | |
| download | samba-fe72740e8221575921c22030d6d4fcb19201b03b.tar.gz samba-fe72740e8221575921c22030d6d4fcb19201b03b.tar.bz2 samba-fe72740e8221575921c22030d6d4fcb19201b03b.zip | |
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>
Diffstat (limited to 'source3/winbindd/winbindd.c')
| -rw-r--r-- | source3/winbindd/winbindd.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 */ |