From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 2 Jul 2015 17:43:52 +0000 (+0000)
Subject: Fix journald support (STR #4655)
X-Git-Tag: v2.2b1~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67fe5048b9729a0f452c79a430b9e9d368331795;p=thirdparty%2Fcups.git

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 738630012..c160c450c 100644
--- 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 cd4e3624f..b7dff704f 100644
--- 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 */