Skip to content

Commit

Permalink
[BZ #1499]
Browse files Browse the repository at this point in the history
	* misc/syslog.c (SyslogAddr): Use sockaddr_un instead of sockaddr.
	(openlog_internal): Adjust for this change.
  • Loading branch information
Ulrich Drepper committed Dec 23, 2005
1 parent 7735afa commit 7ab7969
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2005-12-22 Ulrich Drepper <drepper@redhat.com>

[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.
Expand Down
9 changes: 5 additions & 4 deletions misc/syslog.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/uio.h>
#include <sys/un.h>
#include <netdb.h>

#include <errno.h>
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 7ab7969

Please sign in to comment.