From adc30b4cf95adc72d1315ab9c2827c46747e4b3e Mon Sep 17 00:00:00 2001 From: Cédric Cabessa Date: Mon, 5 Aug 2013 02:09:16 +0200 Subject: syslogd: use _PATH_LOG when available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédric Cabessa Signed-off-by: Denys Vlasenko --- sysklogd/syslogd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sysklogd') diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 4f45b4f7f..a6a4ff25c 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -58,6 +58,9 @@ #define SYSLOG_NAMES_CONST #include */ +#ifndef _PATH_LOG +#define _PATH_LOG "/dev/log" +#endif #include #include @@ -824,8 +827,8 @@ static NOINLINE int create_socket(void) /* Unlink old /dev/log or object it points to. */ /* (if it exists, bind will fail) */ - strcpy(sunx.sun_path, "/dev/log"); - dev_log_name = xmalloc_follow_symlinks("/dev/log"); + strcpy(sunx.sun_path, _PATH_LOG); + dev_log_name = xmalloc_follow_symlinks(_PATH_LOG); if (dev_log_name) { safe_strncpy(sunx.sun_path, dev_log_name, sizeof(sunx.sun_path)); free(dev_log_name); @@ -834,7 +837,7 @@ static NOINLINE int create_socket(void) sock_fd = xsocket(AF_UNIX, SOCK_DGRAM, 0); xbind(sock_fd, (struct sockaddr *) &sunx, sizeof(sunx)); - chmod("/dev/log", 0666); + chmod(_PATH_LOG, 0666); return sock_fd; } @@ -905,7 +908,7 @@ static void do_syslogd(void) sz = read(sock_fd, recvbuf, MAX_READ - 1); if (sz < 0) { if (!bb_got_signal) - bb_perror_msg("read from /dev/log"); + bb_perror_msg("read from %s", _PATH_LOG); break; } -- cgit v1.2.3