diff options
| author | roberto <roberto@FreeBSD.org> | 2002-10-29 20:04:27 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2002-10-29 20:04:27 +0000 |
| commit | c3ce66cde9cb92f8c28b5a6c717776ecabb584d7 (patch) | |
| tree | ef1818c9a91e581dafc61bfa572279965885011e /contrib/ntp/ntpd/ntp_proto.c | |
| parent | a925fb398bce4939d6e5c35c6ffa80a63bdf3b7d (diff) | |
| download | FreeBSD-src-c3ce66cde9cb92f8c28b5a6c717776ecabb584d7.zip FreeBSD-src-c3ce66cde9cb92f8c28b5a6c717776ecabb584d7.tar.gz | |
Merge conflicts.
MFC after: 1 month
Diffstat (limited to 'contrib/ntp/ntpd/ntp_proto.c')
| -rw-r--r-- | contrib/ntp/ntpd/ntp_proto.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 2374afa..da47e0f 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -311,11 +311,7 @@ receive( #endif if (restrict_mask & RES_IGNORE) return; /* no anything */ - if (!(SRCPORT(&rbufp->recv_srcadr) == NTP_PORT || - SRCPORT(&rbufp->recv_srcadr) >= IPPORT_RESERVED)) { - sys_badlength++; - return; /* invalid port */ - } + pkt = &rbufp->recv_pkt; if (PKT_VERSION(pkt->li_vn_mode) == NTP_VERSION) { sys_newversionpkt++; /* new version */ @@ -2508,7 +2504,8 @@ int default_get_precision(void) { struct timeval tp; -#if !defined(SYS_WINNT) && !defined(VMS) && !defined(_SEQUENT_) +#if !defined(SYS_WINNT) && !defined(VMS) && !defined(_SEQUENT_) && \ + !defined(MPE) struct timezone tzp; #elif defined(VMS) || defined(_SEQUENT_) struct timezone { |
