Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/ntp resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/191f58052bef
branches: trunk
changeset: 555923:191f58052bef
user: drochner <drochner%NetBSD.org@localhost>
date: Thu Dec 04 16:23:34 2003 +0000
description:
resolve conflicts
(in this case, throw away all local modifications; I'll start patching
from scratch)
diffstat:
dist/ntp/ElectricFence/efence.c | 2 +-
dist/ntp/ElectricFence/efence.h | 2 +-
dist/ntp/ElectricFence/eftest.c | 2 +-
dist/ntp/ElectricFence/page.c | 2 +-
dist/ntp/ElectricFence/print.c | 2 +-
dist/ntp/ElectricFence/tstheap.c | 2 +-
dist/ntp/README.cvs | 24 -
dist/ntp/README.des | 16 -
dist/ntp/README.rsa | 62 -
dist/ntp/acconfig.h | 476 -
dist/ntp/adjtimed/adjtimed.c | 2 +-
dist/ntp/arlib/arlib.c | 2 +-
dist/ntp/arlib/arlib.h | 2 +-
dist/ntp/arlib/arplib.h | 2 +-
dist/ntp/arlib/sample.c | 2 +-
dist/ntp/clockstuff/chutest.c | 2 +-
dist/ntp/clockstuff/clktest.c | 2 +-
dist/ntp/clockstuff/propdelay.c | 2 +-
dist/ntp/conf/dewey.conf | 42 -
dist/ntp/config.h.in | 1589 +-
dist/ntp/configure | 29046 ++++++++++++++++++-------
dist/ntp/configure.in | 2004 +-
dist/ntp/html/Oncore-SHMEM.htm | 257 -
dist/ntp/html/accopt.htm | 144 -
dist/ntp/html/assoc.htm | 170 -
dist/ntp/html/audio.htm | 153 -
dist/ntp/html/authopt.htm | 278 -
dist/ntp/html/biblio.htm | 253 -
dist/ntp/html/build.htm | 180 -
dist/ntp/html/clockopt.htm | 193 -
dist/ntp/html/config.htm | 288 -
dist/ntp/html/confopt.htm | 215 -
dist/ntp/html/copyright.htm | 209 -
dist/ntp/html/debug.htm | 284 -
dist/ntp/html/driver1.htm | 157 -
dist/ntp/html/driver10.htm | 114 -
dist/ntp/html/driver11.htm | 150 -
dist/ntp/html/driver12.htm | 98 -
dist/ntp/html/driver16.htm | 43 -
dist/ntp/html/driver18.htm | 235 -
dist/ntp/html/driver19.htm | 124 -
dist/ntp/html/driver2.htm | 137 -
dist/ntp/html/driver20.htm | 131 -
dist/ntp/html/driver22.htm | 129 -
dist/ntp/html/driver23.htm | 178 -
dist/ntp/html/driver24.htm | 85 -
dist/ntp/html/driver26.htm | 109 -
dist/ntp/html/driver27.htm | 634 -
dist/ntp/html/driver28.htm | 133 -
dist/ntp/html/driver29.htm | 1251 -
dist/ntp/html/driver3.htm | 131 -
dist/ntp/html/driver30.htm | 158 -
dist/ntp/html/driver32.htm | 42 -
dist/ntp/html/driver33.htm | 38 -
dist/ntp/html/driver34.htm | 54 -
dist/ntp/html/driver35.htm | 82 -
dist/ntp/html/driver36.htm | 844 -
dist/ntp/html/driver37.htm | 75 -
dist/ntp/html/driver4.htm | 126 -
dist/ntp/html/driver5.htm | 159 -
dist/ntp/html/driver6.htm | 242 -
dist/ntp/html/driver7.htm | 596 -
dist/ntp/html/driver8.htm | 334 -
dist/ntp/html/driver9.htm | 123 -
dist/ntp/html/exec.htm | 284 -
dist/ntp/html/extern.htm | 40 -
dist/ntp/html/gadget.htm | 107 -
dist/ntp/html/genkeys.htm | 152 -
dist/ntp/html/hints.htm | 26 -
dist/ntp/html/hints/a-ux | 195 -
dist/ntp/html/hints/aix | 76 -
dist/ntp/html/hints/bsdi | 65 -
dist/ntp/html/hints/changes | 13 -
dist/ntp/html/hints/decosf1 | 40 -
dist/ntp/html/hints/decosf2 | 54 -
dist/ntp/html/hints/freebsd | 15 -
dist/ntp/html/hints/hpux | 158 -
dist/ntp/html/hints/linux | 5 -
dist/ntp/html/hints/notes-xntp-v3 | 119 -
dist/ntp/html/hints/parse | 105 -
dist/ntp/html/hints/refclocks | 35 -
dist/ntp/html/hints/rs6000 | 56 -
dist/ntp/html/hints/sco.htm | 39 -
dist/ntp/html/hints/sgi | 74 -
dist/ntp/html/hints/solaris-dosynctodr.html | 320 -
dist/ntp/html/hints/solaris.html | 143 -
dist/ntp/html/hints/solaris.xtra.4023118 | 36 -
dist/ntp/html/hints/solaris.xtra.4095849 | 74 -
dist/ntp/html/hints/solaris.xtra.S99ntpd | 21 -
dist/ntp/html/hints/solaris.xtra.patchfreq | 85 -
dist/ntp/html/hints/sun4 | 15 -
dist/ntp/html/hints/svr4-dell | 8 -
dist/ntp/html/hints/svr4_package | 33 -
dist/ntp/html/hints/todo | 4 -
dist/ntp/html/hints/vxworks.html | 18 -
dist/ntp/html/hints/winnt.htm | 322 -
dist/ntp/html/howto.htm | 315 -
dist/ntp/html/htmlprimer.htm | 1198 -
dist/ntp/html/index.htm | 197 -
dist/ntp/html/kern.htm | 51 -
dist/ntp/html/kernpps.htm | 26 -
dist/ntp/html/ldisc.htm | 161 -
dist/ntp/html/measure.htm | 50 -
dist/ntp/html/miscopt.htm | 167 -
dist/ntp/html/monopt.htm | 250 -
dist/ntp/html/mx4200data.htm | 443 -
dist/ntp/html/notes.htm | 1543 -
dist/ntp/html/ntpd.htm | 190 -
dist/ntp/html/ntpdate.htm | 185 -
dist/ntp/html/ntpdc.htm | 620 -
dist/ntp/html/ntpq.htm | 747 -
dist/ntp/html/ntptime.htm | 96 -
dist/ntp/html/ntptrace.htm | 82 -
dist/ntp/html/parsedata.htm | 407 -
dist/ntp/html/parsenew.htm | 237 -
dist/ntp/html/patches.htm | 67 -
dist/ntp/html/porting.htm | 78 -
dist/ntp/html/pps.htm | 84 -
dist/ntp/html/prefer.htm | 332 -
dist/ntp/html/qth.htm | 64 -
dist/ntp/html/quick.htm | 86 -
dist/ntp/html/rdebug.htm | 67 -
dist/ntp/html/refclock.htm | 142 -
dist/ntp/html/release.htm | 200 -
dist/ntp/html/tickadj.htm | 90 -
dist/ntp/html/vxworks.htm | 153 -
dist/ntp/html/y2k.htm | 132 -
dist/ntp/include/adjtime.h | 2 +-
dist/ntp/include/ascii.h | 2 +-
dist/ntp/include/audio.h | 2 +-
dist/ntp/include/binio.h | 2 +-
dist/ntp/include/global.h | 2 +-
dist/ntp/include/gps.h | 2 +-
dist/ntp/include/hopf6039.h | 2 +-
dist/ntp/include/icom.h | 2 +-
dist/ntp/include/ieee754io.h | 2 +-
dist/ntp/include/iosignal.h | 2 +-
dist/ntp/include/isc/app.h | 2 +-
dist/ntp/include/isc/assertions.h | 2 +-
dist/ntp/include/isc/boolean.h | 2 +-
dist/ntp/include/isc/error.h | 2 +-
dist/ntp/include/isc/formatcheck.h | 2 +-
dist/ntp/include/isc/int.h | 2 +-
dist/ntp/include/isc/interfaceiter.h | 2 +-
dist/ntp/include/isc/ipv6.h | 2 +-
dist/ntp/include/isc/lang.h | 2 +-
dist/ntp/include/isc/lib.h | 2 +-
dist/ntp/include/isc/list.h | 2 +-
dist/ntp/include/isc/magic.h | 2 +-
dist/ntp/include/isc/mem.h | 2 +-
dist/ntp/include/isc/msgcat.h | 2 +-
dist/ntp/include/isc/msgs.h | 2 +-
dist/ntp/include/isc/mutex.h | 2 +-
dist/ntp/include/isc/net.h | 2 +-
dist/ntp/include/isc/netaddr.h | 2 +-
dist/ntp/include/isc/offset.h | 2 +-
dist/ntp/include/isc/once.h | 2 +-
dist/ntp/include/isc/platform.h | 2 +-
dist/ntp/include/isc/print.h | 2 +-
dist/ntp/include/isc/result.h | 2 +-
dist/ntp/include/isc/sockaddr.h | 2 +-
dist/ntp/include/isc/strerror.h | 2 +-
dist/ntp/include/isc/string.h | 2 +-
dist/ntp/include/isc/types.h | 2 +-
dist/ntp/include/isc/util.h | 2 +-
dist/ntp/include/l_stdlib.h | 2 +-
dist/ntp/include/mbg_gps166.h | 2 +-
dist/ntp/include/md5.h | 53 -
dist/ntp/include/mx4200.h | 2 +-
dist/ntp/include/ntif.h | 2 +-
dist/ntp/include/ntp.h | 2 +-
dist/ntp/include/ntp_calendar.h | 2 +-
dist/ntp/include/ntp_cmdargs.h | 2 +-
dist/ntp/include/ntp_config.h | 2 +-
dist/ntp/include/ntp_control.h | 2 +-
dist/ntp/include/ntp_crypto.h | 2 +-
dist/ntp/include/ntp_datum.h | 2 +-
dist/ntp/include/ntp_filegen.h | 2 +-
dist/ntp/include/ntp_fp.h | 2 +-
dist/ntp/include/ntp_if.h | 2 +-
dist/ntp/include/ntp_io.h | 2 +-
dist/ntp/include/ntp_machine.h | 2 +-
dist/ntp/include/ntp_malloc.h | 2 +-
dist/ntp/include/ntp_md5.h | 2 +-
dist/ntp/include/ntp_proto.h | 2 +-
dist/ntp/include/ntp_refclock.h | 2 +-
dist/ntp/include/ntp_request.h | 2 +-
dist/ntp/include/ntp_rfc2553.h | 2 +-
dist/ntp/include/ntp_select.h | 2 +-
dist/ntp/include/ntp_sprintf.h | 2 +-
dist/ntp/include/ntp_stdlib.h | 2 +-
dist/ntp/include/ntp_string.h | 2 +-
dist/ntp/include/ntp_syscall.h | 2 +-
dist/ntp/include/ntp_syslog.h | 2 +-
dist/ntp/include/ntp_tty.h | 2 +-
dist/ntp/include/ntp_types.h | 2 +-
dist/ntp/include/ntp_unixtime.h | 2 +-
dist/ntp/include/ntpd.h | 156 +-
dist/ntp/include/ntpsim.h | 2 +-
dist/ntp/include/parse.h | 2 +-
dist/ntp/include/parse_conf.h | 2 +-
dist/ntp/include/recvbuff.h | 2 +-
dist/ntp/include/rsa_md5.h | 2 +-
dist/ntp/include/trimble.h | 2 +-
dist/ntp/kernel/chuinit.c | 2 +-
dist/ntp/kernel/clkinit.c | 2 +-
dist/ntp/kernel/sys/bsd_audioirig.h | 2 +-
dist/ntp/kernel/sys/chudefs.h | 2 +-
dist/ntp/kernel/sys/clkdefs.h | 2 +-
dist/ntp/kernel/sys/i8253.h | 2 +-
dist/ntp/kernel/sys/parsestreams.h | 2 +-
dist/ntp/kernel/sys/pcl720.h | 2 +-
dist/ntp/kernel/sys/ppsclock.h | 2 +-
dist/ntp/kernel/sys/timex.h | 2 +-
dist/ntp/kernel/sys/tpro.h | 2 +-
dist/ntp/kernel/sys/tt560_api.h | 2 +-
dist/ntp/kernel/tty_chu.c | 4 +-
dist/ntp/kernel/tty_chu_STREAMS.c | 2 +-
dist/ntp/kernel/tty_clk.c | 4 +-
dist/ntp/kernel/tty_clk_STREAMS.c | 2 +-
dist/ntp/libisc/assertions.c | 2 +-
dist/ntp/libisc/error.c | 2 +-
dist/ntp/libisc/ifiter_ioctl.c | 2 +-
dist/ntp/libisc/ifiter_sysctl.c | 2 +-
dist/ntp/libisc/inet_ntop.c | 2 +-
dist/ntp/libisc/interfaceiter.c | 2 +-
dist/ntp/libisc/isc_strerror.c | 2 +-
dist/ntp/libisc/lib.c | 2 +-
dist/ntp/libisc/mem.c | 2 +-
dist/ntp/libisc/msgcat.c | 2 +-
dist/ntp/libisc/net.c | 2 +-
dist/ntp/libisc/strerror.c | 2 +-
dist/ntp/libntp/a_md5encrypt.c | 2 +-
dist/ntp/libntp/adjtime.c | 2 +-
dist/ntp/libntp/adjtimex.c | 4 +-
dist/ntp/libntp/atoint.c | 2 +-
dist/ntp/libntp/atolfp.c | 2 +-
dist/ntp/libntp/atouint.c | 2 +-
dist/ntp/libntp/audio.c | 475 +-
dist/ntp/libntp/authencrypt.c | 99 -
dist/ntp/libntp/authkeys.c | 2 +-
dist/ntp/libntp/authparity.c | 66 -
dist/ntp/libntp/authreadkeys.c | 2 +-
dist/ntp/libntp/authusekey.c | 2 +-
dist/ntp/libntp/binio.c | 2 +-
dist/ntp/libntp/buftvtots.c | 2 +-
dist/ntp/libntp/caljulian.c | 2 +-
dist/ntp/libntp/calleapwhen.c | 2 +-
dist/ntp/libntp/caltontp.c | 2 +-
dist/ntp/libntp/calyearstart.c | 2 +-
dist/ntp/libntp/clocktime.c | 2 +-
dist/ntp/libntp/clocktypes.c | 2 +-
dist/ntp/libntp/decodenetnum.c | 2 +-
dist/ntp/libntp/dofptoa.c | 2 +-
dist/ntp/libntp/dolfptoa.c | 2 +-
dist/ntp/libntp/emalloc.c | 2 +-
dist/ntp/libntp/findconfig.c | 2 +-
dist/ntp/libntp/fptoa.c | 2 +-
dist/ntp/libntp/fptoms.c | 2 +-
dist/ntp/libntp/getopt.c | 2 +-
dist/ntp/libntp/gpstolfp.c | 4 +-
dist/ntp/libntp/hextoint.c | 2 +-
dist/ntp/libntp/hextolfp.c | 2 +-
dist/ntp/libntp/humandate.c | 2 +-
dist/ntp/libntp/icom.c | 2 +-
dist/ntp/libntp/ieee754io.c | 2 +-
dist/ntp/libntp/inttoa.c | 2 +-
dist/ntp/libntp/iosignal.c | 2 +-
dist/ntp/libntp/lib_strbuf.c | 2 +-
dist/ntp/libntp/lib_strbuf.h | 2 +-
dist/ntp/libntp/log.c | 2 +-
dist/ntp/libntp/log.h | 2 +-
dist/ntp/libntp/machines.c | 2 +-
dist/ntp/libntp/md5c.c | 2 +-
dist/ntp/libntp/memmove.c | 16 +-
dist/ntp/libntp/mfp_mul.c | 2 +-
dist/ntp/libntp/mfptoa.c | 2 +-
dist/ntp/libntp/mfptoms.c | 2 +-
dist/ntp/libntp/mktime.c | 60 +-
dist/ntp/libntp/modetoa.c | 2 +-
dist/ntp/libntp/mstolfp.c | 2 +-
dist/ntp/libntp/msutotsf.c | 2 +-
dist/ntp/libntp/msyslog.c | 246 +-
dist/ntp/libntp/netof.c | 2 +-
dist/ntp/libntp/ntp_rfc2553.c | 2 +-
dist/ntp/libntp/numtoa.c | 2 +-
dist/ntp/libntp/numtohost.c | 2 +-
dist/ntp/libntp/octtoint.c | 2 +-
dist/ntp/libntp/prettydate.c | 2 +-
dist/ntp/libntp/random.c | 8 +-
dist/ntp/libntp/ranny.c | 2 +-
dist/ntp/libntp/recvbuff.c | 2 +-
dist/ntp/libntp/refnumtoa.c | 2 +-
dist/ntp/libntp/snprintf.c | 2 +-
dist/ntp/libntp/socktoa.c | 2 +-
dist/ntp/libntp/socktohost.c | 2 +-
dist/ntp/libntp/statestr.c | 2 +-
dist/ntp/libntp/strdup.c | 2 +-
dist/ntp/libntp/strerror.c | 2 +-
dist/ntp/libntp/strstr.c | 4 +-
dist/ntp/libntp/syssignal.c | 2 +-
dist/ntp/libntp/systime.c | 406 +-
dist/ntp/libntp/systime_s.c | 2 +-
dist/ntp/libntp/tsftomsu.c | 2 +-
dist/ntp/libntp/tstotv.c | 2 +-
dist/ntp/libntp/tvtoa.c | 2 +-
dist/ntp/libntp/tvtots.c | 2 +-
dist/ntp/libntp/uglydate.c | 2 +-
dist/ntp/libntp/uinttoa.c | 2 +-
dist/ntp/libntp/utvtoa.c | 2 +-
dist/ntp/libntp/ymd2yd.c | 2 +-
dist/ntp/libparse/clk_computime.c | 8 +-
dist/ntp/libparse/clk_dcf7000.c | 7 +-
dist/ntp/libparse/clk_hopf6021.c | 7 +-
dist/ntp/libparse/clk_meinberg.c | 9 +-
dist/ntp/libparse/clk_rawdcf.c | 7 +-
dist/ntp/libparse/clk_rcc8000.c | 7 +-
dist/ntp/libparse/clk_schmid.c | 7 +-
dist/ntp/libparse/clk_trimtaip.c | 6 +-
dist/ntp/libparse/clk_trimtsip.c | 2 +-
dist/ntp/libparse/clk_varitext.c | 29 +-
dist/ntp/libparse/clk_wharton.c | 4 +-
dist/ntp/libparse/data_mbg.c | 2 +-
dist/ntp/libparse/info_trimble.c | 2 +-
dist/ntp/libparse/parse.c | 2 +-
dist/ntp/libparse/parse_conf.c | 2 +-
dist/ntp/libparse/parsesolaris.c | 2 +-
dist/ntp/libparse/parsestreams.c | 2 +-
dist/ntp/libparse/trim_info.c | 2 +-
dist/ntp/librsaref/Makefile.am | 57 -
dist/ntp/librsaref/Makefile.in | 389 -
dist/ntp/ntp_update | 68 -
dist/ntp/ntpd/check_y2k.c | 2 +-
dist/ntp/ntpd/cmd_args.c | 2 +-
dist/ntp/ntpd/jupiter.h | 4 +-
dist/ntp/ntpd/map_vme.c | 2 +-
dist/ntp/ntpd/ntp_config.c | 1469 +-
dist/ntp/ntpd/ntp_control.c | 524 +-
dist/ntp/ntpd/ntp_crypto.c | 4536 +++-
dist/ntp/ntpd/ntp_filegen.c | 2 +-
dist/ntp/ntpd/ntp_intres.c | 158 +-
dist/ntp/ntpd/ntp_io.c | 2074 +-
dist/ntp/ntpd/ntp_loopfilter.c | 818 +-
dist/ntp/ntpd/ntp_monitor.c | 2 +-
dist/ntp/ntpd/ntp_peer.c | 2 +-
dist/ntp/ntpd/ntp_proto.c | 2 +-
dist/ntp/ntpd/ntp_refclock.c | 2 +-
dist/ntp/ntpd/ntp_request.c | 1199 +-
dist/ntp/ntpd/ntp_resolver.c | 991 -
dist/ntp/ntpd/ntp_restrict.c | 2 +-
dist/ntp/ntpd/ntp_timer.c | 2 +-
dist/ntp/ntpd/ntp_util.c | 433 +-
dist/ntp/ntpd/ntpd.c | 293 +-
dist/ntp/ntpd/ntpsim.c | 2 +-
dist/ntp/ntpd/refclock_acts.c | 2 +-
dist/ntp/ntpd/refclock_arbiter.c | 2 +-
dist/ntp/ntpd/refclock_arc.c | 2 +-
dist/ntp/ntpd/refclock_as2201.c | 2 +-
dist/ntp/ntpd/refclock_atom.c | 2 +-
dist/ntp/ntpd/refclock_bancomm.c | 2 +-
dist/ntp/ntpd/refclock_chronolog.c | 2 +-
dist/ntp/ntpd/refclock_chu.c | 665 +-
dist/ntp/ntpd/refclock_conf.c | 2 +-
dist/ntp/ntpd/refclock_datum.c | 2 +-
dist/ntp/ntpd/refclock_dumbclock.c | 2 +-
dist/ntp/ntpd/refclock_fg.c | 14 +-
dist/ntp/ntpd/refclock_gpsvme.c | 2 +-
dist/ntp/ntpd/refclock_heath.c | 2 +-
dist/ntp/ntpd/refclock_hopfpci.c | 2 +-
dist/ntp/ntpd/refclock_hopfser.c | 2 +-
dist/ntp/ntpd/refclock_hpgps.c | 2 +-
dist/ntp/ntpd/refclock_irig.c | 2 +-
dist/ntp/ntpd/refclock_jjy.c | 2 +-
dist/ntp/ntpd/refclock_jupiter.c | 2 +-
dist/ntp/ntpd/refclock_leitch.c | 2 +-
dist/ntp/ntpd/refclock_local.c | 2 +-
dist/ntp/ntpd/refclock_msfees.c | 2 +-
dist/ntp/ntpd/refclock_mx4200.c | 2 +-
dist/ntp/ntpd/refclock_neoclock4x.c | 2 +-
dist/ntp/ntpd/refclock_nmea.c | 2 +-
dist/ntp/ntpd/refclock_oncore.c | 3936 ++-
dist/ntp/ntpd/refclock_palisade.c | 2 +-
dist/ntp/ntpd/refclock_palisade.h | 2 +-
dist/ntp/ntpd/refclock_parse.c | 74 +-
dist/ntp/ntpd/refclock_pcf.c | 2 +-
dist/ntp/ntpd/refclock_pst.c | 2 +-
dist/ntp/ntpd/refclock_ptbacts.c | 2 +-
dist/ntp/ntpd/refclock_ripencc.c | 2 +-
dist/ntp/ntpd/refclock_shm.c | 2 +-
dist/ntp/ntpd/refclock_tpro.c | 2 +-
dist/ntp/ntpd/refclock_trak.c | 2 +-
dist/ntp/ntpd/refclock_true.c | 81 +-
dist/ntp/ntpd/refclock_tt560.c | 2 +-
dist/ntp/ntpd/refclock_ulink.c | 2 +-
dist/ntp/ntpd/refclock_usno.c | 2 +-
dist/ntp/ntpd/refclock_wwv.c | 2174 +-
dist/ntp/ntpd/refclock_wwvb.c | 2 +-
dist/ntp/ntpd/refclock_zyfer.c | 2 +-
dist/ntp/ntpdate/ntpdate.c | 444 +-
dist/ntp/ntpdate/ntpdate.h | 11 +-
dist/ntp/ntpdate/ntptime_config.c | 2 +-
dist/ntp/ntpdate/ntptimeset.c | 44 +-
dist/ntp/ntpdc/nl_in.c | 2 +-
dist/ntp/ntpdc/ntpdc-layout.c | 2 +-
dist/ntp/ntpdc/ntpdc.c | 532 +-
dist/ntp/ntpdc/ntpdc.h | 2 +-
dist/ntp/ntpdc/ntpdc_ops.c | 1019 +-
dist/ntp/ntpq/ntpq.c | 526 +-
dist/ntp/ntpq/ntpq.h | 2 +-
dist/ntp/ntpq/ntpq_ops.c | 221 +-
dist/ntp/ntptrace/Makefile.am | 19 -
dist/ntp/ntptrace/Makefile.in | 374 -
dist/ntp/ntptrace/README | 7 -
dist/ntp/ntptrace/ntptrace.c | 796 -
dist/ntp/ntptrace/ntptrace.h | 38 -
dist/ntp/parseutil/dcfd.c | 2 +-
dist/ntp/parseutil/testdcf.c | 2 +-
dist/ntp/scripts/ntpsweep.in | 2 +-
dist/ntp/scripts/plot_summary.in | 2 +-
dist/ntp/scripts/summary.in | 2 +-
dist/ntp/sntp/header.h | 2 +-
dist/ntp/sntp/internet.c | 2 +-
dist/ntp/sntp/internet.h | 2 +-
dist/ntp/sntp/kludges.h | 2 +-
dist/ntp/sntp/main.c | 2 +-
dist/ntp/sntp/socket.c | 2 +-
dist/ntp/sntp/timing.c | 2 +-
dist/ntp/sntp/unix.c | 2 +-
dist/ntp/stamp-h.in | 1 -
dist/ntp/util/ansi2knr.c | 2 +-
dist/ntp/util/audio-pcm.c | 2 +-
dist/ntp/util/byteorder.c | 2 +-
dist/ntp/util/hist.c | 2 +-
dist/ntp/util/jitter.c | 2 +-
dist/ntp/util/kern.c | 2 +-
dist/ntp/util/longsize.c | 2 +-
dist/ntp/util/ntp-keygen.c | 2 +-
dist/ntp/util/ntp_genkeys.c | 240 -
dist/ntp/util/ntptime.c | 2 +-
dist/ntp/util/pps-api.c | 2 +-
dist/ntp/util/precision.c | 2 +-
dist/ntp/util/sht.c | 2 +-
dist/ntp/util/testrs6000.c | 2 +-
dist/ntp/util/tickadj.c | 18 +-
dist/ntp/util/timetrim.c | 2 +-
445 files changed, 38856 insertions(+), 41423 deletions(-)
diffs (truncated from 96979 to 300 lines):
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/ElectricFence/efence.c
--- a/dist/ntp/ElectricFence/efence.c Thu Dec 04 16:05:14 2003 +0000
+++ b/dist/ntp/ElectricFence/efence.c Thu Dec 04 16:23:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efence.c,v 1.1.1.1 2003/12/04 16:05:20 drochner Exp $ */
+/* $NetBSD: efence.c,v 1.2 2003/12/04 16:23:34 drochner Exp $ */
/*
* Electric Fence - Red-Zone memory allocator.
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/ElectricFence/efence.h
--- a/dist/ntp/ElectricFence/efence.h Thu Dec 04 16:05:14 2003 +0000
+++ b/dist/ntp/ElectricFence/efence.h Thu Dec 04 16:23:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: efence.h,v 1.1.1.1 2003/12/04 16:05:20 drochner Exp $ */
+/* $NetBSD: efence.h,v 1.2 2003/12/04 16:23:34 drochner Exp $ */
#include <sys/types.h>
#include <sys/param.h>
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/ElectricFence/eftest.c
--- a/dist/ntp/ElectricFence/eftest.c Thu Dec 04 16:05:14 2003 +0000
+++ b/dist/ntp/ElectricFence/eftest.c Thu Dec 04 16:23:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eftest.c,v 1.1.1.1 2003/12/04 16:05:20 drochner Exp $ */
+/* $NetBSD: eftest.c,v 1.2 2003/12/04 16:23:34 drochner Exp $ */
#include <stdlib.h>
#include <stdio.h>
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/ElectricFence/page.c
--- a/dist/ntp/ElectricFence/page.c Thu Dec 04 16:05:14 2003 +0000
+++ b/dist/ntp/ElectricFence/page.c Thu Dec 04 16:23:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: page.c,v 1.1.1.1 2003/12/04 16:05:20 drochner Exp $ */
+/* $NetBSD: page.c,v 1.2 2003/12/04 16:23:34 drochner Exp $ */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/ElectricFence/print.c
--- a/dist/ntp/ElectricFence/print.c Thu Dec 04 16:05:14 2003 +0000
+++ b/dist/ntp/ElectricFence/print.c Thu Dec 04 16:23:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.1.1.1 2003/12/04 16:05:20 drochner Exp $ */
+/* $NetBSD: print.c,v 1.2 2003/12/04 16:23:34 drochner Exp $ */
#include "efence.h"
#include <stdlib.h>
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/ElectricFence/tstheap.c
--- a/dist/ntp/ElectricFence/tstheap.c Thu Dec 04 16:05:14 2003 +0000
+++ b/dist/ntp/ElectricFence/tstheap.c Thu Dec 04 16:23:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tstheap.c,v 1.1.1.1 2003/12/04 16:05:20 drochner Exp $ */
+/* $NetBSD: tstheap.c,v 1.2 2003/12/04 16:23:34 drochner Exp $ */
#include <stdlib.h>
#include <stdio.h>
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/README.cvs
--- a/dist/ntp/README.cvs Thu Dec 04 16:05:14 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-To get the NTP distribution via anonymous CVS:
-
- cvs -d :pserver:anoncvs%www.ntp.org@localhost:/cvs/ntp login
-
-the password is: anoncvs
-
- cvs -d :pserver:anoncvs%www.ntp.org@localhost:/cvs/ntp co ntp
-
-after which the "ntp_update" script in the top-level of the tree should
-keep things in synch and properly timestamped.
-
-There are some mailing lists for the NTP CVS distribution. For more
-information, send a message to <majordomo%ntp.org@localhost> with the "lists" in
-the body of the message.
-
-If you get NTP via CVS, you will need to build the release using GNU make
-and gcc.
-
-You can then "make dist" to build a release tarball that does not require
-GNU make or gcc.
-
-The reason GNU make and gcc are required is because the repository version
-of NTP does not have the make dependencies built-in. These dependencies
-are created dynamically, and this dynamic process requires GNU make and gcc.
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/README.des
--- a/dist/ntp/README.des Thu Dec 04 16:05:14 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-If you want DES support in ntp:
-
-- Use MD5 instead:
-- - convert your DES keys to MD5 by changing the 'A', 'N' or 'S' to 'M'
-
-If you *need* DES support:
-
-- first see if you can simply "want" DES support instead
-- Follow the instructions in README.rsa
-
-Be advised that the RSA DES code is not quite as portable as one might
-wish for. In particular, DES under NTP will only work between machines
-of the same "endianness".
-
-Dave would prefer that new/alternative encryption schemes follow the
-RSA API.
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/README.rsa
--- a/dist/ntp/README.rsa Thu Dec 04 16:05:14 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-If you want to use the RSA stuff for crypto keys:
-
-- Get RSAREF or RSAEURO (or a reasonable facsimile thereof)
-- - Unpack it in the top-level source directory of the NTP distribution
- in a directory named rsaref2
- (You should see directories like ports, rsaref2, scripts)
-
-Make sure rsa.c has the security patch applied - a copy of it is at the
-end of this file.
-
-When you run configure, the Right Thing will happen.
-
-Be advised that the RSA DES code is not quite as portable os one might
-wish for. In particular, DES under NTP will only work between machines
-of the same "endianness".
-
-Dave would prefer that new/alternative encryption schemes follow the
-RSA API.
-
-
---- rsa.c.orig Fri Mar 25 14:01:48 1994
-+++ rsaref2/source/rsa.c Mon Dec 13 13:10:28 1999
-@@ -33,6 +33,9 @@
- unsigned char byte, pkcsBlock[MAX_RSA_MODULUS_LEN];
- unsigned int i, modulusLen;
-
-+ if (publicKey->bits > MAX_RSA_MODULUS_BITS)
-+ return (RE_LEN);
-+
- modulusLen = (publicKey->bits + 7) / 8;
- if (inputLen + 11 > modulusLen)
- return (RE_LEN);
-@@ -78,6 +81,9 @@
- unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
- unsigned int i, modulusLen, pkcsBlockLen;
-
-+ if (publicKey->bits > MAX_RSA_MODULUS_BITS)
-+ return (RE_LEN);
-+
- modulusLen = (publicKey->bits + 7) / 8;
- if (inputLen > modulusLen)
- return (RE_LEN);
-@@ -128,6 +134,9 @@
- int status;
- unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
- unsigned int i, modulusLen;
-+
-+ if (privateKey->bits > MAX_RSA_MODULUS_BITS)
-+ return (RE_LEN);
-
- modulusLen = (privateKey->bits + 7) / 8;
- if (inputLen + 11 > modulusLen)
-@@ -168,6 +177,9 @@
- unsigned char pkcsBlock[MAX_RSA_MODULUS_LEN];
- unsigned int i, modulusLen, pkcsBlockLen;
-
-+ if (privateKey->bits > MAX_RSA_MODULUS_BITS)
-+ return (RE_LEN);
-+
- modulusLen = (privateKey->bits + 7) / 8;
- if (inputLen > modulusLen)
- return (RE_LEN);
diff -r 4c46f4276842 -r 191f58052bef dist/ntp/acconfig.h
--- a/dist/ntp/acconfig.h Thu Dec 04 16:05:14 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,476 +0,0 @@
-/* $NetBSD: acconfig.h,v 1.1.1.1 2000/03/29 12:38:44 simonb Exp $ */
-
-/* Package */
-#undef PACKAGE
-
-/* Version */
-#undef VERSION
-
-/* debugging code */
-#undef DEBUG
-
-/* Minutes per DST adjustment */
-#undef DSTMINUTES
-
-/* MD5 authentication */
-#undef MD5
-
-/* DES authentication (COCOM only) */
-#undef DES
-
-/* time_t */
-#undef time_t
-
-/* reference clock interface */
-#undef REFCLOCK
-
-/* Audio CHU? */
-#undef AUDIO_CHU
-
-/* PARSE kernel PLL PPS support */
-#undef PPS_SYNC
-
-/* ACTS modem service */
-#undef CLOCK_ACTS
-
-/* Arbiter 1088A/B GPS receiver */
-#undef CLOCK_ARBITER
-
-/* DHD19970505: ARCRON support. */
-#undef CLOCK_ARCRON_MSF
-
-/* Austron 2200A/2201A GPS receiver */
-#undef CLOCK_AS2201
-
-/* PPS interface */
-#undef CLOCK_ATOM
-
-/* PPS auxiliary interface for ATOM */
-#undef PPS_SAMPLE
-
-/* Datum/Bancomm bc635/VME interface */
-#undef CLOCK_BANC
-
-/* Diems Computime Radio Clock */
-#undef CLOCK_COMPUTIME
-
-/* Chronolog K-series WWVB receiver */
-#undef CLOCK_CHRONOLOG
-
-/* Datum Programmable Time System */
-#undef CLOCK_DATUM
-
-/* ELV/DCF7000 clock */
-#undef CLOCK_DCF7000
-
-/* Dumb generic hh:mm:ss local clock */
-#undef CLOCK_DUMBCLOCK
-
-/* Forum Graphic GPS datating station driver */
-#undef CLOCK_FG
-
-/* TrueTime GPS receiver/VME interface */
-#undef CLOCK_GPSVME
-
-/* Heath GC-1000 WWV/WWVH receiver */
-#undef CLOCK_HEATH
-
-/* HOPF 6021 clock */
-#undef CLOCK_HOPF6021
-
-/* HP 58503A GPS receiver */
-#undef CLOCK_HPGPS
-
-/* Sun IRIG audio decoder */
-#undef CLOCK_IRIG
-
-/* Rockwell Jupiter GPS clock */
-#undef CLOCK_JUPITER
-
-/* Leitch CSD 5300 Master Clock System Driver */
-#undef CLOCK_LEITCH
-
-/* local clock reference */
-#undef CLOCK_LOCAL
-
-/* Meinberg clocks */
-#undef CLOCK_MEINBERG
-
-/* EES M201 MSF receiver */
-#undef CLOCK_MSFEES
-
-/* Magnavox MX4200 GPS receiver */
-#undef CLOCK_MX4200
-
-/* NMEA GPS receiver */
-#undef CLOCK_NMEA
-
-/* Motorola UT Oncore GPS */
-#undef CLOCK_ONCORE
-
-/* Palisade clock */
-#undef CLOCK_PALISADE
-
-/* PARSE driver interface */
-#undef CLOCK_PARSE
-
-/* Conrad parallel port radio clock */
-#undef CLOCK_PCF
-
-/* PCL 720 clock support */
-#undef CLOCK_PPS720
-
-/* PST/Traconex 1020 WWV/WWVH receiver */
-#undef CLOCK_PST
-
-/* PTB modem service */
-#undef CLOCK_PTBACTS
-
Home |
Main Index |
Thread Index |
Old Index