2 files changed, 19 insertions, 2 deletions

diff --git a/other/bootstrap_daemon/src/log.c b/other/bootstrap_daemon/src/log.c
index 7632d739..ae418f93 100644
--- a/other/bootstrap_daemon/src/log.c
+++ b/other/bootstrap_daemon/src/log.c
@@ -26,8 +26,8 @@
 
 #include "global.h"
 
+#include <assert.h>
 #include <syslog.h>
-
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -82,7 +82,22 @@ static int level_syslog(LOG_LEVEL level)
 
 static void log_syslog(LOG_LEVEL level, const char *format, va_list args)
 {
-    vsyslog(level_syslog(level), format, args);
+    va_list args2;
+
+    va_copy(args2, args);
+    int size = vsnprintf(NULL, 0, format, args2);
+    va_end(args2);
+
+    assert(size >= 0);
+
+    if (size < 0) {
+        return;
+    }
+
+    char buf[size + 1];
+    vsnprintf(buf, size + 1, format, args);
+
+    syslog(level_syslog(level), "%s", buf);
 }
 
 static FILE *level_stdout(LOG_LEVEL level)
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index 4495f88e..a0504eee 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -22,6 +22,8 @@
  *
  */
 
+#define _XOPEN_SOURCE 600
+
 // system provided
 #include <sys/stat.h>
 #include <unistd.h>