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/printing/spoolssd.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/printing/spoolssd.c')
-rw-r--r-- | source3/printing/spoolssd.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c index f4bba76bc7..bb043bdba7 100644 --- a/source3/printing/spoolssd.c +++ b/source3/printing/spoolssd.c @@ -58,7 +58,7 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx, static void spoolss_reopen_logs(int child_id) { - char *lfile = lp_logfile(); + char *lfile = lp_logfile(talloc_tos()); char *ext; int rc; @@ -80,10 +80,12 @@ static void spoolss_reopen_logs(int child_id) if (strstr(lfile, ext) == NULL) { if (child_id) { rc = asprintf(&lfile, "%s.%d", - lp_logfile(), child_id); + lp_logfile(talloc_tos()), + child_id); } else { rc = asprintf(&lfile, "%s.%s", - lp_logfile(), ext); + lp_logfile(talloc_tos()), + ext); } } } @@ -607,14 +609,14 @@ static void print_queue_forward(struct messaging_context *msg, static char *get_bq_logfile(void) { - char *lfile = lp_logfile(); + char *lfile = lp_logfile(talloc_tos()); int rc; if (lfile == NULL || lfile[0] == '\0') { rc = asprintf(&lfile, "%s/log.%s.bq", get_dyn_LOGFILEBASE(), DAEMON_NAME); } else { - rc = asprintf(&lfile, "%s.bq", lp_logfile()); + rc = asprintf(&lfile, "%s.bq", lp_logfile(talloc_tos())); } if (rc == -1) { lfile = NULL; |