diff options
| author | delphij <delphij@FreeBSD.org> | 2017-03-28 04:48:17 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2017-03-28 04:48:17 +0000 |
| commit | 9e55018b05bf06a66cff34b38d0513f3e6ce1693 (patch) | |
| tree | 902f92e264fe4e9744915013573ddc0d77146551 /contrib/ntp/ntpd/ntp_peer.c | |
| parent | d39342cfdc6bedaba7e1c71da4f06feb63517476 (diff) | |
| download | FreeBSD-src-9e55018b05bf06a66cff34b38d0513f3e6ce1693.zip FreeBSD-src-9e55018b05bf06a66cff34b38d0513f3e6ce1693.tar.gz | |
MFC r315871: MFV r315791: ntp 4.2.8p10.
Diffstat (limited to 'contrib/ntp/ntpd/ntp_peer.c')
| -rw-r--r-- | contrib/ntp/ntpd/ntp_peer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/ntp/ntpd/ntp_peer.c b/contrib/ntp/ntpd/ntp_peer.c index 04dee20..a296ea7 100644 --- a/contrib/ntp/ntpd/ntp_peer.c +++ b/contrib/ntp/ntpd/ntp_peer.c @@ -161,7 +161,7 @@ getmorepeermem(void) int i; struct peer *peers; - peers = emalloc_zero(INC_PEER_ALLOC * sizeof(*peers)); + peers = eallocarray(INC_PEER_ALLOC, sizeof(*peers)); for (i = INC_PEER_ALLOC - 1; i >= 0; i--) LINK_SLIST(peer_free, &peers[i], p_link); @@ -309,7 +309,8 @@ findpeer( for (p = peer_hash[hash]; p != NULL; p = p->adr_link) { /* [Bug 3072] ensure interface of peer matches */ - if (p->dstadr != rbufp->dstadr) + /* [Bug 3356] ... if NOT a broadcast peer! */ + if (p->hmode != MODE_BCLIENT && p->dstadr != rbufp->dstadr) continue; /* ensure peer source address matches */ |
