From 7ab7969c70f8b97fa8dd2e4a8f0220dbcef241db Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 23 Dec 2005 04:38:20 +0000 Subject: [PATCH] [BZ #1499] * misc/syslog.c (SyslogAddr): Use sockaddr_un instead of sockaddr. (openlog_internal): Adjust for this change. --- ChangeLog | 4 ++++ misc/syslog.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4aab33c..30db047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-12-22 Ulrich Drepper + [BZ #1499] + * misc/syslog.c (SyslogAddr): Use sockaddr_un instead of sockaddr. + (openlog_internal): Adjust for this change. + * Makeconfig: Define CXXFLAGS. Split out warnings from +gccwarn which are not understood by the C++ compiler. * Makerules: Add rules to build C++ code for test cases. diff --git a/misc/syslog.c b/misc/syslog.c index cae13f8..6b0e774 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -35,6 +35,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94"; #include #include #include +#include #include #include @@ -326,7 +327,7 @@ vsyslog(pri, fmt, ap) } libc_hidden_def (vsyslog) -static struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */ +static struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */ static void @@ -342,9 +343,9 @@ openlog_internal(const char *ident, int logstat, int logfac) int retry = 0; while (retry < 2) { if (LogFile == -1) { - SyslogAddr.sa_family = AF_UNIX; - (void)strncpy(SyslogAddr.sa_data, _PATH_LOG, - sizeof(SyslogAddr.sa_data)); + SyslogAddr.sun_family = AF_UNIX; + (void)strncpy(SyslogAddr.sun_path, _PATH_LOG, + sizeof(SyslogAddr.sun_path)); if (LogStat & LOG_NDELAY) { if ((LogFile = __socket(AF_UNIX, LogType, 0)) == -1) -- 2.7.4