d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make SyslogAddr a sockaddr_un rather than a sockaddr.

Browse Source 
This wasn't a problem in practice as PATH_LOG and PATH_OLDLOG
are both < sizeof sockaddr::sa_data.
This commit is contained in:
Brian Somers 1998-03-05 22:17:59 +00:00
parent 5dd528cd4e
commit d584948ecd
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libc/gen/syslog.c
View File

@ -36,13 +36,14 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
*/
static const char rcsid[] =
"$Id: syslog.c,v 1.12 1997/03/11 11:52:33 peter Exp $";
"$Id: syslog.c,v 1.13 1997/03/20 16:28:14 jdp Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/uio.h>
#include <sys/un.h>
#include <netdb.h>
#include <errno.h>
@ -291,7 +292,7 @@ disconnectlog()
static void
connectlog()
{
struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */
struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */
if (LogFile == -1) {
if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
@ -299,11 +300,11 @@ connectlog()
(void)fcntl(LogFile, F_SETFD, 1);
}
if (LogFile != -1 && !connected) {
SyslogAddr.sa_len = sizeof(SyslogAddr);
SyslogAddr.sa_family = AF_UNIX;
(void)strncpy(SyslogAddr.sa_data, _PATH_LOG,
sizeof(SyslogAddr.sa_data));
connected = connect(LogFile, &SyslogAddr,
SyslogAddr.sun_len = sizeof(SyslogAddr);
SyslogAddr.sun_family = AF_UNIX;
(void)strncpy(SyslogAddr.sun_path, _PATH_LOG,
sizeof(SyslogAddr.sun_path));
connected = connect(LogFile, (struct sockaddr *)&SyslogAddr,
sizeof(SyslogAddr)) != -1;
if (!connected) {
@ -311,9 +312,10 @@ connectlog()
* Try the old "/dev/log" path, for backward
* compatibility.
*/
(void)strncpy(SyslogAddr.sa_data, _PATH_OLDLOG,
sizeof(SyslogAddr.sa_data));
connected = connect(LogFile, &SyslogAddr,
(void)strncpy(SyslogAddr.sun_path, _PATH_OLDLOG,
sizeof(SyslogAddr.sun_path));
connected = connect(LogFile,
(struct sockaddr *)&SyslogAddr,
sizeof(SyslogAddr)) != -1;
}