Fix journald support (STR #4655)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12773 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 7386300127e6acc646194825e6e554e4d82a77b0..c160c450c3ef793af136e39a34d7e4b3bec2a68a 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,11 @@
-CHANGES.txt - 2.1b2 - 2015-06-24
+CHANGES.txt - 2.1b2 - 2015-07-02
 ---------------------------------
 
 CHANGES IN CUPS V2.1b2
 
        - Added support for 3D printers (basic types only, no built-in filters)
          based on PWG white paper.
+       - Fixed a bug in the journald support (STR #4655)
 
 
 CHANGES IN CUPS V2.1b1

diff --git a/scheduler/log.c b/scheduler/log.c
index cd4e3624f77423386be7672c1bb6d47dd2ff20c1..b7dff704f09731fdffce4cd3ed4409ef33108c56 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -812,7 +812,9 @@ cupsdLogMessage(int        level,   /* I - Log level */
 #elif defined(HAVE_SYSTEMD_SD_JOURNAL_H)
   if (!strcmp(ErrorLog, "syslog"))
   {
+    va_start(ap, message);
     sd_journal_printv(log_levels[level], message, ap);
+    va_end(ap);
     return (1);
   }
 #endif /* HAVE_ASL_H */