From 84dc7f83d362da5b6393bbd9a579d289b0fc4745 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 28 Mar 2011 14:30:29 +0200 Subject: [PATCH] s3-spoolssd: Fixed logfile creation. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner (cherry picked from commit 80fe8fa8d0d2ec787e4d70a3553c1d4e066f4163) --- source3/printing/spoolssd.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c index 6f55f0cdbfa..9ddc3b5f82a 100644 --- a/source3/printing/spoolssd.c +++ b/source3/printing/spoolssd.c @@ -37,13 +37,22 @@ static void spoolss_reopen_logs(void) char *lfile = lp_logfile(); int rc; - if (strstr(lfile, DAEMON_NAME) == NULL) { - rc = asprintf(&lfile, "%s.%s", lp_logfile(), DAEMON_NAME); + if (lfile == NULL || lfile[0] == '\0') { + rc = asprintf(&lfile, "%s/log.%s", get_dyn_LOGFILEBASE(), DAEMON_NAME); if (rc > 0) { lp_set_logfile(lfile); SAFE_FREE(lfile); } + } else { + if (strstr(lfile, DAEMON_NAME) == NULL) { + rc = asprintf(&lfile, "%s.%s", lp_logfile(), DAEMON_NAME); + if (rc > 0) { + lp_set_logfile(lfile); + SAFE_FREE(lfile); + } + } } + reopen_logs(); } -- 2.11.4.GIT