 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
 	The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #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 */
 /*
  *  syslogd -- log system messages
+ *
  * This program implements a system log. It takes a series of lines.
  * Each line may have a priority, signified as "<n>" as
  * the first characters of the line.  If this is
  * not present, a default priority is used.
+ *
  * To kill syslogd, send a signal 15 (terminate).  A signal 1 (hup) will
  * cause it to reread its configuration file.
 @@ -2479,26 +2479,28 @@ udp_send(struct filed *f, char *line, si
 	DPRINTF((D_NET|D_CALL), "udp_send(f=%p, line=\"%s\", "
 	    "len=%zu) to dest.\n", f, line, len);
 	if (!finet)
 		return;
 	lsent = -1;
 	fail = 0;
 	assert(f->f_type == F_FORW);
 	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);
 			if (lsent == -1) {
 				switch (errno) {
 				case ENOBUFS:
 					/* wait/retry/drop */
 					if (++retry < 5) {
 						usleep(1000);
 						goto sendagain;
+					}
 					break;
 				case EHOSTDOWN:
 @@ -3965,26 +3967,27 @@ socksetup(int af, const char *hostname)
 	if (!socks) {
 		logerror("Couldn't allocate memory for sockets");
 		die(0, 0, NULL);
+	}
 	socks->fd = 0;	 /* num of sockets counter at start of array */
 	s = socks + 1;
 	for (r = res; r; r = r->ai_next) {
 		s->fd = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
 		if (s->fd < 0) {
 			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");
 			close(s->fd);
 			continue;
+		}
 		if (!SecureMode) {
 			if (bind(s->fd, r->ai_addr, r->ai_addrlen) < 0) {
 				logerror("bind() failed");
 				close(s->fd);
 				continue;
+			}

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Sch�tte.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -292,26 +292,27 @@ struct buf_msg {
 	size_t	 prilen;       /* bytes for priority and version  */
 };
 /* queue of messages */
 struct buf_queue {
 	struct buf_msg* msg;
 	STAILQ_ENTRY(buf_queue) entries;
 };
 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;
 };
 /*
  * Flags to logmsg().
  */
 #define IGN_CONS	0x001	/* don't print on console */
 #define SYNC_FILE	0x002	/* do fsync on file after printing */
 #define ADDDATE		0x004	/* add a date to the message */
 #define MARK		0x008	/* this message is a mark */
 #define ISKERNEL	0x010	/* kernel generated message */
 #define BSDSYSLOG	0x020	/* line in traditional BSD Syslog format */
 #define SIGN_MSG	0x040	/* syslog-sign data, not signed again */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Sch�tte.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -35,27 +35,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * tls.c TLS related code for syslogd
+ *
  * implements the TLS init and handshake callbacks with all required
  * checks from http://tools.ietf.org/html/draft-ietf-syslog-transport-tls-13
+ *
  * Martin Sch�tte
  */
 #include <sys/cdefs.h>
-__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"
 #include "tls.h"
 #include <netinet/in.h>
 #include <ifaddrs.h>
 #include "extern.h"
 static unsigned getVerifySetting(const char *x509verifystring);
 /* to output SSL error codes */
 static const char *SSL_ERRCODE[] = {
 	"SSL_ERROR_NONE",
 @@ -841,26 +841,27 @@ socksetup_tls(const int af, const char *
 	if (!socks) {
 		logerror("Unable to allocate memory for sockets");
 		die(0, 0, NULL);
+	}
 	socks->fd = 0;	 /* num of sockets counter at start of array */
 	s = socks + 1;
 	for (r = res; r; r = r->ai_next) {
 		if ((s->fd = socket(r->ai_family, r->ai_socktype,
 			r->ai_protocol)) == -1) {
 			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) {
 			logerror("setsockopt(IPV6_V6ONLY) failed: %s",
 			    strerror(errno));
 			close(s->fd);
 			continue;
+		}
 		if (setsockopt(s->fd, SOL_SOCKET, SO_REUSEADDR,
 			&on, sizeof(on)) == -1) {
 			DPRINTF(D_NET, "Unable to setsockopt(): %s\n",
 			    strerror(errno));
+		}