oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslogd(8): drop some MINIX-specific changes

Browse Source 
Change-Id: Ic286b89975eeea1abf0d5086ee13dfb9ab57d8ba
This commit is contained in:
David van Moolenbroek 2017-02-17 11:41:41 +00:00
parent 5bded7c030
commit 686761dbbc
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/syslogd/Makefile
View File

@ -19,7 +19,6 @@ SYMLINKS= /var/run/log /dev/log
.PATH.c: ${NETBSDSRCDIR}/usr.bin/who .PATH.c: ${NETBSDSRCDIR}/usr.bin/who
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP -Wredundant-decls CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP -Wredundant-decls
.if !defined(__MINIX)
.if (${USE_INET6} != "no") .if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif .endif
@ -27,7 +26,6 @@ CPPFLAGS+=-DINET6
CPPFLAGS+=-DLIBWRAP CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap LDADD+= -lwrap
DPADD+= ${LIBWRAP} DPADD+= ${LIBWRAP}
.endif # !defined(__MINIX)
.if ${MKCRYPTO} != "no" .if ${MKCRYPTO} != "no"
LDADD+= -lssl -lcrypto LDADD+= -lssl -lcrypto

12
usr.sbin/syslogd/syslogd.c
View File

@ -1808,26 +1808,14 @@ void
logmsg(struct buf_msg *buffer) logmsg(struct buf_msg *buffer)
{ {
struct filed *f; struct filed *f;
#ifndef __minix
int fac, omask, prilev; int fac, omask, prilev;
#else /* __minix */
int fac, prilev;
sigset_t omask;
#endif /* __minix */
DPRINTF((D_CALL|D_BUFFER), "logmsg: buffer@%p, pri 0%o/%d, flags 0x%x," DPRINTF((D_CALL|D_BUFFER), "logmsg: buffer@%p, pri 0%o/%d, flags 0x%x,"
" timestamp \"%s\", from \"%s\", sd \"%s\", msg \"%s\"\n", " timestamp \"%s\", from \"%s\", sd \"%s\", msg \"%s\"\n",
buffer, buffer->pri, buffer->pri, buffer->flags, buffer, buffer->pri, buffer->pri, buffer->flags,
buffer->timestamp, buffer->recvhost, buffer->sd, buffer->msg); buffer->timestamp, buffer->recvhost, buffer->sd, buffer->msg);
#ifndef __minix
omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM)); omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
#else /* __minix */
sigemptyset(&omask);
sigaddset(&omask, SIGHUP);
sigaddset(&omask, SIGALRM);
#define sigsetmask(s) (sigprocmask(SIG_SETMASK, &s, NULL))
#endif /* __minix */
/* sanity check */ /* sanity check */
assert(buffer->refcount == 1); assert(buffer->refcount == 1);

2
usr.sbin/syslogd/syslogd.h
View File

@ -125,11 +125,9 @@ extern int dehumanize_number(const char *str, int64_t *size);
char *strndup(const char *str, size_t n); char *strndup(const char *str, size_t n);
#endif /* !HAVE_STRNDUP */ #endif /* !HAVE_STRNDUP */
#if !defined(__minix)
#ifdef LIBWRAP #ifdef LIBWRAP
#include <tcpd.h> #include <tcpd.h>
#endif #endif
#endif /* !defined(__minix) */
#define FDMASK(fd) (1 << (fd)) #define FDMASK(fd) (1 << (fd))