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;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
