s3-spoolssd: Fixed logfile creation.
authorAndreas Schneider <asn@samba.org>
Mon, 28 Mar 2011 12:30:29 +0000 (14:30 +0200)
committerAndreas Schneider <asn@samba.org>
Wed, 30 Mar 2011 13:47:50 +0000 (15:47 +0200)
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit 80fe8fa8d0d2ec787e4d70a3553c1d4e066f4163)

source3/printing/spoolssd.c

index 6f55f0cdbfa6bad2414f09e11d12be4f8308a9ed..9ddc3b5f82acb3884defc88b7296bb5aa35978d2 100644 (file)
@@ -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();
 }