From owner-svn-src-head@freebsd.org  Tue Dec 13 20:55:47 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C2B7C7629E;
 Tue, 13 Dec 2016 20:55:47 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BE8F1508;
 Tue, 13 Dec 2016 20:55:47 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBDKtk0C023904;
 Tue, 13 Dec 2016 20:55:46 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBDKtk7V023903;
 Tue, 13 Dec 2016 20:55:46 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201612132055.uBDKtk7V023903@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 13 Dec 2016 20:55:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310035 - head/usr.sbin/syslogd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Dec 2016 20:55:47 -0000

Author: hrs
Date: Tue Dec 13 20:55:46 2016
New Revision: 310035
URL: https://svnweb.freebsd.org/changeset/base/310035

Log:
  Remove an extra "break" which could incorrectly terminate an
  STAILQ_FOREACH() loop when an AF_INET6 rule matched.
  
  Spotted by:	cem

Modified:
  head/usr.sbin/syslogd/syslogd.c

Modified: head/usr.sbin/syslogd/syslogd.c
==============================================================================
--- head/usr.sbin/syslogd/syslogd.c	Tue Dec 13 20:54:38 2016	(r310034)
+++ head/usr.sbin/syslogd/syslogd.c	Tue Dec 13 20:55:46 2016	(r310035)
@@ -2465,7 +2465,6 @@ validate(struct sockaddr *sa, const char
 	struct allowedpeer *ap;
 	struct sockaddr_in *sin4, *a4p = NULL, *m4p = NULL;
 #ifdef INET6
-	int reject;
 	struct sockaddr_in6 *sin6, *a6p = NULL, *m6p = NULL;
 #endif
 	struct addrinfo hints, *res;
@@ -2533,13 +2532,8 @@ validate(struct sockaddr *sa, const char
 					dprintf("rejected in rule %d due to scope mismatch.\n", i);
 					continue;
 				}
-				reject = 0;
 				if (IN6_ARE_MASKED_ADDR_EQUAL(&sin6->sin6_addr,
 				    &a6p->sin6_addr, &m6p->sin6_addr) != 0) {
-					++reject;
-					break;
-				}
-				if (reject) {
 					dprintf("rejected in rule %d due to IP mismatch.\n", i);
 					continue;
 				}