From c3ce66cde9cb92f8c28b5a6c717776ecabb584d7 Mon Sep 17 00:00:00 2001 From: roberto Date: Tue, 29 Oct 2002 20:04:27 +0000 Subject: Merge conflicts. MFC after: 1 month --- contrib/ntp/ntpd/ntp_proto.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'contrib/ntp/ntpd/ntp_proto.c') 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 { -- cgit v1.1