upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add backward compatibility so that static executables built on

Browse source 
modern FreeBSD systems will syslog properly on older systems that
still name the logging socket "/dev/log".  This includes pre-2.2
versions of FreeBSD as well as BSD/OS systems.  If the connect to
"/var/run/log" fails, the function now tries to connect to
"/dev/log" as a fallback.
This commit is contained in:
John Polstra 1997-03-20 16:28:27 +00:00
parent d00f4c321d
commit cf49f43912
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/libc/gen/syslog.c
View file

@ -36,7 +36,7 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
*/
static const char rcsid[] =
"$Id: syslog.c,v 1.11 1997/02/22 14:58:18 peter Exp $";
"$Id: syslog.c,v 1.12 1997/03/11 11:52:33 peter Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -273,9 +273,6 @@ vsyslog(pri, fmt, ap)
(void)close(fd);
}
}
static struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */
static void
disconnectlog()
{
@ -294,20 +291,36 @@ disconnectlog()
static void
connectlog()
{
struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */
if (LogFile == -1) {
SyslogAddr.sa_family = AF_UNIX;
(void)strncpy(SyslogAddr.sa_data, _PATH_LOG,
sizeof(SyslogAddr.sa_data));
if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
return;
(void)fcntl(LogFile, F_SETFD, 1);
}
if (LogFile != -1 && !connected) {
if (connect(LogFile, &SyslogAddr, sizeof(SyslogAddr)) == -1) {
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,
sizeof(SyslogAddr)) != -1;
if (!connected) {
/*
* Try the old "/dev/log" path, for backward
* compatibility.
*/
(void)strncpy(SyslogAddr.sa_data, _PATH_OLDLOG,
sizeof(SyslogAddr.sa_data));
connected = connect(LogFile, &SyslogAddr,
sizeof(SyslogAddr)) != -1;
}
if (!connected) {
(void)close(LogFile);
LogFile = -1;
} else
connected = 1;
}
}
}

3
sys/sys/syslog.h
View file

@ -31,13 +31,14 @@
* SUCH DAMAGE.
*
* @(#)syslog.h 8.1 (Berkeley) 6/2/93
* $Id: syslog.h,v 1.11 1997/02/26 06:03:20 mpp Exp $
* $Id: syslog.h,v 1.12 1997/03/02 09:19:15 joerg Exp $
*/
#ifndef _SYS_SYSLOG_H_
#define _SYS_SYSLOG_H_
#define _PATH_LOG "/var/run/log"
#define _PATH_OLDLOG "/dev/log" /* backward compatibility */
/*
* priorities/facilities are encoded into a single 32-bit quantity, where the