[Git][NTPsec/ntpsec][master] 2 commits: Remove file leftover from using saveconfigquit to check parser.

Sun Jul 3 06:57:00 UTC 2016

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
d57d9c90 by Hal Murray at 2016-07-02T23:16:29-07:00
Remove file leftover from using saveconfigquit to check parser.

- - - - -
7dc4671a by Hal Murray at 2016-07-02T23:56:13-07:00
Fix typos.

- - - - -


3 changed files:

- devel/hacking.txt
- docs/index.txt
- − ntpd/complete.conf


Changes:

=====================================
devel/hacking.txt
=====================================

--- a/devel/hacking.txt
+++ b/devel/hacking.txt
@@ -391,7 +391,7 @@ There are two kinds of merge bubbles in git commit graphs. The
 necessary kind happens because branches have genuinely diverged enough
 that a merge by hand is required - common files have been touched in
 incompatible ways. In the unnecessary kind, the patches on either side
-of the bubble commute cleanly, but the developer on one side or the 
+of the bubble commute cleanly, but the developer on one side or the other
 forgot to rebase so his commit would be a fast-forward.
 
 We strongly dislike unnecessary merge bubbles.  They make the
@@ -402,7 +402,7 @@ from new ones because a long-lived branch was rebased.
 
 To avoid merge bubbles, git pull --rebase before pushing.  This will
 pull all pending commits from the repo, then attempt to rebase your
-locak commits on the new tip.  You may find it helpful to set
+local commits on the new tip.  You may find it helpful to set
 "rebase = true" in your .git/config, so it looks like this:
 
 -------------------------------------------------------------


=====================================
docs/index.txt
=====================================
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -108,7 +108,7 @@ few will be user-visible.
   saveconfig command in ntpq, the --saveconfigquit option of ntpd, and
   the implementation of related config declarations in ntp.conf.
 
-* The code has been systematically hardened, with with unsafe string
+* The code has been systematically hardened, with unsafe string
   copy and formatting functions replaced by safe (bounded) ones.
 
 * In toto, around 60% of the NTP Classic code has been outright


=====================================
ntpd/complete.conf deleted
=====================================
--- a/ntpd/complete.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-driftfile "/etc/ntp.drift" 1e-7
-logfile "/var/log/ntp.log"
-leapfile "/etc/ntp.leapseconds"
-nonvolatile 1e-7
-logconfig =allall -allinfo -allevents -allstatistics -allstatus +allall -clockinfo -clockevents -clockstatistics -clockstatus +clockall -syncinfo -syncevents -syncstatistics -syncstatus +syncall -sysinfo -sysevents -sysstatistics -sysstatus +sysall
-statsdir "/etc/ntp/stats"
-statistics clockstats cryptostats loopstats peerstats protostats rawstats sysstats timingstats
-filegen clockstats file clockstats type none enable
-filegen cryptostats file cryptostats type pid link disable
-filegen loopstats file loopstats type day nolink enable
-filegen peerstats file peerstats type week enable
-filegen protostats file stats type month enable
-filegen rawstats file rawstats type year nolink enable
-filegen sysstats file sysstats type age enable
-filegen timingstats file timingstats type none disable
-crypto digest md5 host myhostname pw cryptopass randfile /.rnd
-revoke 10
-keysdir "/etc/ntp/keys"
-keys "/etc/ntp.keys"
-trustedkey 1 2 3 4 5 6 7 8 9 10 11 12 (14 ... 16) 18 (32768 ... 65534)
-controlkey 12
-enable auth ntp monitor stats
-disable bclient calibrate kernel
-tos beacon 3600 ceiling 16 cohort 0 floor 1 maxclock 10 maxdist 1.5 minclock 3 mindist 0.001 minsane 1 orphan 16 orphanwait 300
-rlimit memlock 0 stacksize 50
-tinker allan 1500 dispersion 15 freq 0 huffpuff 7200 panic 1000 step 0.128 stepout 900 tick 0.01
-broadcastclient
-reclock local mode 4294967295 prefer true time1 0 time2 1.1 stratum 7 refid Abcd
-pool 0.north-america.pool.ntp.org. iburst preempt
-server 1.north-america.pool.ntp.org. iburst
-server -4 2.north-america.pool.ntp.org. minpoll 6 maxpoll 10 iburst
-server -6 ntp.davehart.net. minpoll 6 maxpoll 10 version 5 burst iburst
-peer -6 davehart.broker.freenet6.net.
-peer -4 192.168.192.168 key 1 noselect
-server [fe80::123%1]
-broadcast 192.168.192.255
-manycastclient 224.0.1.1
-manycastclient ff05::101
-manycastserver 224.0.1.1 ff05::101
-multicastclient 224.0.1.1 ff05::101
-mru maxage 64 mindepth 600 initalloc 600 initmem 16 incalloc 99 incmem 4 maxdepth 1024 maxmem 4096
-discard minimum 1 average 3 monitor 3000
-restrict default
-restrict default nomodify limited kod noserve nomrulist
-restrict source
-restrict source nomodify limited kod
-restrict trusted.host.name.example.com. nomodify
-restrict [fe80::1] mask [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]
-restrict 127.0.0.1 mask 255.255.255.255
-restrict ::1
-interface drop ipv6
-interface ignore ipv4
-interface drop wildcard
-interface listen eth0
-interface listen ipv6
-interface listen 192.168.192.0/24
-interface listen 192.168.193.1
-phone "ATDT13034944774" "ATDT12027621594"
-setvar varnondef = "this variable does not have default after the value"
-setvar vanity = "name plate" default
-trap 127.0.0.1 interface 127.0.0.1 port 1234
-trap 127.0.0.2
-reset allpeers auth ctl io mem sys timer



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/0ed4e17d4bf3d0d61add4f746392743eabbd82d6...7dc4671afc8043bef03d5afd4ae6e437fc21fda8
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160703/131da6a0/attachment.html>
