freebsd-nq/contrib/ntp/ntpd
Ollivier Robert 4a0fa52fa0 Merge conflicts (see also previous commit).
Reinsert our local changes to ntp_control.c:

1.4:    Do not log every potential exploit attempt since a denial-of-service
        may result
1.5:    int -> unsigned char fixes
2004-07-20 15:18:31 +00:00
..
check_y2k.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
cmd_args.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
jupiter.h
Makefile.am Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
Makefile.in Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
map_vme.c
ntp_config.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_control.c Merge conflicts (see also previous commit). 2004-07-20 15:18:31 +00:00
ntp_crypto.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_filegen.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_intres.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_io.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_loopfilter.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_monitor.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_peer.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_proto.c Revert this file to the vendor version, we don't need to have our own 2004-07-20 15:15:00 +00:00
ntp_refclock.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_request.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_restrict.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_timer.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntp_util.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntpd.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
ntpsim.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_acts.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_arbiter.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_arc.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_as2201.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_atom.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_bancomm.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_chronolog.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_chu.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_conf.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_datum.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_dumbclock.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_fg.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_gpsvme.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_heath.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_hopfpci.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_hopfser.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_hpgps.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_irig.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_jjy.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_jupiter.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_leitch.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_local.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_msfees.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_mx4200.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_neoclock4x.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_nmea.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_oncore.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_palisade.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_palisade.h Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_parse.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_pcf.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_pst.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_ptbacts.c
refclock_ripencc.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_shm.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_tpro.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_trak.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_true.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_tt560.c
refclock_ulink.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_usno.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_wwv.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_wwvb.c Virgin import of ntpd 4.2.0 2004-07-20 15:01:56 +00:00
refclock_zyfer.c Virgin import of ntpd 4.1.1b 2002-11-04 19:36:11 +00:00