CVS commit: [netbsd-6] src/usr.sbin/syslogd
Module Name:src Committed By: snj Date: Fri Oct 13 07:57:51 UTC 2017 Modified Files: src/usr.sbin/syslogd [netbsd-6]: syslogd.c Log Message: Pull up following revision(s) (requested by ginsbach in ticket #1504): usr.sbin/syslogd/syslogd.c: revision 1.124 Use looked up remote host for remote message without a hostname An incoming remote message may not necessarily have a hostname between the timestamp and the message. The the source of the remote sender is already looked up so use that hostname/IP address rather than the local hostname. To generate a diff of this commit: cvs rdiff -u -r1.105.4.2 -r1.105.4.3 src/usr.sbin/syslogd/syslogd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/syslogd/syslogd.c diff -u src/usr.sbin/syslogd/syslogd.c:1.105.4.2 src/usr.sbin/syslogd/syslogd.c:1.105.4.3 --- src/usr.sbin/syslogd/syslogd.c:1.105.4.2 Thu Aug 31 15:10:29 2017 +++ src/usr.sbin/syslogd/syslogd.c Fri Oct 13 07:57:51 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: syslogd.c,v 1.105.4.2 2017/08/31 15:10:29 martin Exp $ */ +/* $NetBSD: syslogd.c,v 1.105.4.3 2017/10/13 07:57:51 snj Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; #else -__RCSID("$NetBSD: syslogd.c,v 1.105.4.2 2017/08/31 15:10:29 martin Exp $"); +__RCSID("$NetBSD: syslogd.c,v 1.105.4.3 2017/10/13 07:57:51 snj Exp $"); #endif #endif /* not lint */ @@ -1272,7 +1272,7 @@ printline_bsdsyslog(const char *hname, c } else if (*p == '[' || (*p == ':' && (*(p+1) == ' ' || *(p+1) == '\0'))) { /* no host in message */ - buffer->host = LocalFQDN; + buffer->host = strdup(hname); buffer->prog = strndup(start, p - start); break; } else {
CVS commit: [netbsd-6] src/usr.sbin/syslogd
Module Name:src Committed By: martin Date: Thu Aug 31 15:10:29 UTC 2017 Modified Files: src/usr.sbin/syslogd [netbsd-6]: syslogd.c Log Message: Pull up following revision(s) (requested by ginsbach in ticket #1496): usr.sbin/syslogd/syslogd.c: revision 1.123 PR/51234: Onno van der Linden: syslogd sometimes incorrectly handles iso to bsd time conversion To generate a diff of this commit: cvs rdiff -u -r1.105.4.1 -r1.105.4.2 src/usr.sbin/syslogd/syslogd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/syslogd/syslogd.c diff -u src/usr.sbin/syslogd/syslogd.c:1.105.4.1 src/usr.sbin/syslogd/syslogd.c:1.105.4.2 --- src/usr.sbin/syslogd/syslogd.c:1.105.4.1 Thu Jun 13 07:11:11 2013 +++ src/usr.sbin/syslogd/syslogd.c Thu Aug 31 15:10:29 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: syslogd.c,v 1.105.4.1 2013/06/13 07:11:11 msaitoh Exp $ */ +/* $NetBSD: syslogd.c,v 1.105.4.2 2017/08/31 15:10:29 martin Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; #else -__RCSID("$NetBSD: syslogd.c,v 1.105.4.1 2013/06/13 07:11:11 msaitoh Exp $"); +__RCSID("$NetBSD: syslogd.c,v 1.105.4.2 2017/08/31 15:10:29 martin Exp $"); #endif #endif /* not lint */ @@ -1739,27 +1739,28 @@ check_timestamp(unsigned char *from_buf, struct tm parsed; time_t timeval; char tsbuf[MAX_TIMESTAMPLEN]; - int i = 0; + int i = 0, j; DPRINTF(D_CALL, "check_timestamp(): convert ISO->BSD\n"); for(i = 0; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0' && from_buf[i] != '.' && from_buf[i] != ' '; i++) tsbuf[i] = from_buf[i]; /* copy date & time */ + j = i; for(; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0' && from_buf[i] != '+' && from_buf[i] != '-' && from_buf[i] != 'Z' && from_buf[i] != ' '; i++) ; /* skip fraction digits */ for(; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0' - && from_buf[i] != ':' && from_buf[i] != ' ' ; i++) - tsbuf[i] = from_buf[i]; /* copy TZ */ + && from_buf[i] != ':' && from_buf[i] != ' ' ; i++, j++) + tsbuf[j] = from_buf[i]; /* copy TZ */ if (from_buf[i] == ':') i++; /* skip colon */ for(; i < MAX_TIMESTAMPLEN && from_buf[i] != '\0' - && from_buf[i] != ' ' ; i++) - tsbuf[i] = from_buf[i]; /* copy TZ */ + && from_buf[i] != ' ' ; i++, j++) + tsbuf[j] = from_buf[i]; /* copy TZ */ (void)memset(&parsed, 0, sizeof(parsed)); - parsed.tm_isdst = -1; (void)strptime(tsbuf, "%FT%T%z", &parsed); + parsed.tm_isdst = -1; timeval = mktime(&parsed); *to_buf = strndup(make_timestamp(&timeval, false),
CVS commit: [netbsd-6] src/usr.sbin/syslogd
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:11:11 UTC 2013 Modified Files: src/usr.sbin/syslogd [netbsd-6]: syslogd.c syslogd.h tls.c Log Message: Pull up following revision(s) (requested by pettai in ticket #897): usr.sbin/syslogd/tls.c: revision 1.11 usr.sbin/syslogd/syslogd.h: revision 1.4 usr.sbin/syslogd/syslogd.c: revision 1.115 PR/47861: Fredrik Pettai: keep track of the address family for each socket opened and don't send the a message to the wrong family type. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.105.4.1 src/usr.sbin/syslogd/syslogd.c cvs rdiff -u -r1.3 -r1.3.8.1 src/usr.sbin/syslogd/syslogd.h cvs rdiff -u -r1.9 -r1.9.2.1 src/usr.sbin/syslogd/tls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/syslogd/syslogd.c diff -u src/usr.sbin/syslogd/syslogd.c:1.105 src/usr.sbin/syslogd/syslogd.c:1.105.4.1 --- src/usr.sbin/syslogd/syslogd.c:1.105 Wed Aug 31 16:25:00 2011 +++ src/usr.sbin/syslogd/syslogd.c Thu Jun 13 07:11:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: syslogd.c,v 1.105 2011/08/31 16:25:00 plunky Exp $ */ +/* $NetBSD: syslogd.c,v 1.105.4.1 2013/06/13 07:11:11 msaitoh Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; #else -__RCSID("$NetBSD: syslogd.c,v 1.105 2011/08/31 16:25:00 plunky Exp $"); +__RCSID("$NetBSD: syslogd.c,v 1.105.4.1 2013/06/13 07:11:11 msaitoh Exp $"); #endif #endif /* not lint */ @@ -2489,6 +2489,8 @@ udp_send(struct filed *f, char *line, si for (r = f->f_un.f_forw.f_addr; r; r = r->ai_next) { retry = 0; for (j = 0; j < finet->fd; j++) { + if (finet[j+1].af != r->ai_family) +continue; sendagain: lsent = sendto(finet[j+1].fd, line, len, 0, r->ai_addr, r->ai_addrlen); @@ -3975,6 +3977,7 @@ socksetup(int af, const char *hostname) logerror("socket() failed"); continue; } + s->af = r->ai_family; if (r->ai_family == AF_INET6 && setsockopt(s->fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) { logerror("setsockopt(IPV6_V6ONLY) failed"); Index: src/usr.sbin/syslogd/syslogd.h diff -u src/usr.sbin/syslogd/syslogd.h:1.3 src/usr.sbin/syslogd/syslogd.h:1.3.8.1 --- src/usr.sbin/syslogd/syslogd.h:1.3 Mon Apr 20 09:56:08 2009 +++ src/usr.sbin/syslogd/syslogd.h Thu Jun 13 07:11:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: syslogd.h,v 1.3 2009/04/20 09:56:08 mschuett Exp $ */ +/* $NetBSD: syslogd.h,v 1.3.8.1 2013/06/13 07:11:11 msaitoh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -302,6 +302,7 @@ STAILQ_HEAD(buf_queue_head, buf_queue); /* a pair of a socket and an associated event object */ struct socketEvent { int fd; + int af; struct event *ev; }; Index: src/usr.sbin/syslogd/tls.c diff -u src/usr.sbin/syslogd/tls.c:1.9 src/usr.sbin/syslogd/tls.c:1.9.2.1 --- src/usr.sbin/syslogd/tls.c:1.9 Mon Feb 13 07:40:24 2012 +++ src/usr.sbin/syslogd/tls.c Thu Jun 13 07:11:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tls.c,v 1.9 2012/02/13 07:40:24 spz Exp $ */ +/* $NetBSD: tls.c,v 1.9.2.1 2013/06/13 07:11:11 msaitoh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include -__RCSID("$NetBSD: tls.c,v 1.9 2012/02/13 07:40:24 spz Exp $"); +__RCSID("$NetBSD: tls.c,v 1.9.2.1 2013/06/13 07:11:11 msaitoh Exp $"); #ifndef DISABLE_TLS #include "syslogd.h" @@ -851,6 +851,7 @@ socksetup_tls(const int af, const char * logerror("socket() failed: %s", strerror(errno)); continue; } + s->af = r->ai_family; if (r->ai_family == AF_INET6 && setsockopt(s->fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) == -1) {