4 files changed, 10 insertions, 2 deletions

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index 03d65b37f..4db72110d 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -58,6 +58,7 @@
 //usage:     "\n        -n      Run in foreground"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <syslog.h>
 
 
@@ -147,7 +148,7 @@ static void klogd_close(void)
 
 #define log_buffer bb_common_bufsiz1
 enum {
-        KLOGD_LOGBUF_SIZE = sizeof(log_buffer),
+        KLOGD_LOGBUF_SIZE = COMMON_BUFSIZE,
         OPT_LEVEL      = (1 << 0),
         OPT_FOREGROUND = (1 << 1),
 };
@@ -173,6 +174,8 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
         int opt;
         int used;
 
+        setup_common_bufsiz();
+
         opt = getopt32(argv, "c:n", &opt_c);
         if (opt & OPT_LEVEL) {
                 /* Valid levels are between 1 and 8 */
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index b3ca85703..f9eafeb25 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -99,6 +99,8 @@ int logger_main(int argc UNUSED_PARAM, char **argv)
         int opt;
         int i = 0;
 
+        setup_common_bufsiz();
+
         /* Fill out the name string early (may be overwritten later) */
         str_t = uid2uname_utoa(geteuid());
 
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 781a603b2..5b999730a 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -42,6 +42,7 @@
 //usage:     "\n        -F      Same as -f, but dump buffer first"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
@@ -67,11 +68,12 @@ struct globals {
         struct sembuf SMrdn[2]; // {1, 0}, {0, +1, SEM_UNDO}
         struct shbuf_ds *shbuf;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define SMrup (G.SMrup)
 #define SMrdn (G.SMrdn)
 #define shbuf (G.shbuf)
 #define INIT_G() do { \
+        setup_common_bufsiz(); \
         memcpy(SMrup, init_sem, sizeof(init_sem)); \
 } while (0)
 
diff --git a/sysklogd/syslogd_and_logger.c b/sysklogd/syslogd_and_logger.c
index 0964f239c..6458a9332 100644
--- a/sysklogd/syslogd_and_logger.c
+++ b/sysklogd/syslogd_and_logger.c
@@ -8,6 +8,7 @@
  */
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #define SYSLOG_NAMES
 #define SYSLOG_NAMES_CONST
 #include <syslog.h>