From 91d7f332e017465275d744cb9d66a7c835628830 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Wed, 24 Aug 2005 02:21:12 +0000 Subject: [PATCH] - Remove NTP servers which do not resolve in DNS. - Use pool.ntp.org servers where possible, thanks to Chuck Swiger . - Update list of Swedish NTP servers, thanks to Fredrik Lindberg . PR: bin/75479 MFC after: 1 day --- usr.sbin/sade/menus.c | 156 ++++++++++++++++-------------------- usr.sbin/sysinstall/menus.c | 156 ++++++++++++++++-------------------- 2 files changed, 138 insertions(+), 174 deletions(-) diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 1bfad6343855..015419944bb4 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -1528,21 +1528,21 @@ DMenu MenuNTP = { { "Argentina #3", "tock.nap.com.ar", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.nap.com.ar" }, - { "Australia", "augean.eleceng.adelaide.edu.au", + { "Australia", "au.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=au.pool.ntp.org" }, + { "Australia #2", "augean.eleceng.adelaide.edu.au", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=augean.eleceng.adelaide.edu.au" }, - { "Australia #2", "ntp.adelaide.edu.au", + { "Australia #3", "ntp.adelaide.edu.au", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.adelaide.edu.au" }, - { "Australia #3", "ntp.saard.net", + { "Australia #4", "ntp.saard.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.saard.net" }, - { "Australia #4", "time.deakin.edu.au", + { "Australia #5", "time.deakin.edu.au", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.deakin.edu.au" }, - { "Australia #5", "time.esec.com.au", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=time.esec.com.au" }, { "Belgium", "ntp1.belbone.be", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.belbone.be" }, @@ -1561,28 +1561,31 @@ DMenu MenuNTP = { { "Brazil #4", "ntp1.pucpr.br", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.pucpr.br" }, - { "Canada", "ntp.cpsc.ucalgary.ca", + { "Canada", "ca.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ca.pool.ntp.org" }, + { "Canada #2", "ntp.cpsc.ucalgary.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.cpsc.ucalgary.ca" }, - { "Canada #2", "ntp1.cmc.ec.gc.ca", + { "Canada #3", "ntp1.cmc.ec.gc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.cmc.ec.gc.ca" }, - { "Canada #3", "ntp2.cmc.ec.gc.ca", + { "Canada #4", "ntp2.cmc.ec.gc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2.cmc.ec.gc.ca" }, - { "Canada #4", "tick.utoronto.ca", + { "Canada #5", "tick.utoronto.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.utoronto.ca" }, - { "Canada #5", "time.chu.nrc.ca", + { "Canada #6", "time.chu.nrc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.chu.nrc.ca" }, - { "Canada #6", "time.nrc.ca", + { "Canada #7", "time.nrc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.nrc.ca" }, - { "Canada #7", "timelord.uregina.ca", + { "Canada #8", "timelord.uregina.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timelord.uregina.ca" }, - { "Canada #8", "tock.utoronto.ca", + { "Canada #9", "tock.utoronto.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.utoronto.ca" }, { "Czech", "ntp.karpo.cz", @@ -1630,15 +1633,15 @@ DMenu MenuNTP = { { "Hungary", "time.kfki.hu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.kfki.hu" }, - { "Indonesia", "ntp.incaf.net", + { "Indonesia", "ntp.kim.lipi.go.id", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.incaf.net" }, + "ntpdate_enable=YES,ntpdate_flags=ntp.kim.lipi.go.id" }, { "Ireland", "ntp.maths.tcd.ie", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.maths.tcd.ie" }, - { "Italy", "ntps.net4u.it", + { "Italy", "it.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=" }, + "ntpdate_enable=YES,ntpdate_flags=it.pool.ntp.org" }, { "Japan", "ntp.jst.mfeed.ad.jp", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.jst.mfeed.ad.jp" }, @@ -1648,18 +1651,9 @@ DMenu MenuNTP = { { "Korea", "time.nuri.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.nuri.net" }, - { "Mexico", "ntp2a.audiotel.com.mx", + { "Mexico", "mx.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2a.audiotel.com.mx" }, - { "Mexico #2", "ntp2b.audiotel.com.mx", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2b.audiotel.com.mx" }, - { "Mexico #3", "ntp2c.audiotel.com.mx", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2c.audiotel.com.mx" }, - { "Nigeria", "ntp.supernet300.com", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.supernet300.com" }, + "ntpdate_enable=YES,ntpdate_flags=mx.pool.ntp.org" }, { "Netherlands", "ntp0.nl.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" }, @@ -1690,27 +1684,36 @@ DMenu MenuNTP = { { "Poland", "info.cyf-kr.edu.pl", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=info.cyf-kr.edu.pl" }, - { "Portugal", "bug.fe.up.pt", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=bug.fe.up.pt" }, { "Romania", "ticks.roedu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ticks.roedu.net" }, - { "Russia", "ntp.psn.ru", + { "Russia", "ru.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ru.pool.ntp.org" }, + { "Russia #2", "ntp.psn.ru", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.psn.ru" }, - { "Russia #2", "sign.chg.ru", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=sign.chg.ru" }, - { "Sweden", "ntp.lth.se", + { "Sweden", "se.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=se.pool.ntp.org" }, + { "Sweden #2", "ntp.lth.se", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.lth.se" }, - { "Singapore", "ntp.shim.org", + { "Sweden #3", "ntp1.sp.se", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ntp1.sp.se" }, + { "Sweden #4", "ntp2.sp.se", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ntp2.sp.se" }, + { "Sweden #5", "ntp.kth.se", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ntp.kth.se" }, + { "Singapore", "sg.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.shim.org" }, - { "Slovenia", "calvus.rzs-hm.si", + "ntpdate_enable=YES,ntpdate_flags=sg.pool.ntp.org" }, + { "Slovenia", "si.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=calvus.rzs-hm.si" }, + "ntpdate_enable=YES,ntpdate_flags=si.pool.ntp.org" }, { "Slovenia #2", "sizif.mf.uni-lj.si", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=sizif.mf.uni-lj.si" }, @@ -1726,34 +1729,37 @@ DMenu MenuNTP = { { "Scotland", "ntp.cs.strath.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.cs.strath.ac.uk" }, - { "United Kingdom", "ntp.exnet.com", + { "United Kingdom", "uk.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=uk.pool.ntp.org" }, + { "United Kingdom #2", "ntp.exnet.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.exnet.com" }, - { "United Kingdom #2", "ntp0.uk.uu.net", + { "United Kingdom #3", "ntp0.uk.uu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.uk.uu.net" }, - { "United Kingdom #3", "ntp1.uk.uu.net", + { "United Kingdom #4", "ntp1.uk.uu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.uk.uu.net" }, - { "United Kingdom #4", "ntp2.uk.uu.net", + { "United Kingdom #5", "ntp2.uk.uu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2.uk.uu.net" }, - { "United Kingdom #5", "ntp2a.mcc.ac.uk", + { "United Kingdom #6", "ntp2a.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2a.mcc.ac.uk" }, - { "United Kingdom #6", "ntp2b.mcc.ac.uk", + { "United Kingdom #7", "ntp2b.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2b.mcc.ac.uk" }, - { "United Kingdom #7", "ntp2c.mcc.ac.uk", + { "United Kingdom #8", "ntp2c.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2c.mcc.ac.uk" }, - { "United Kingdom #8", "ntp2d.mcc.ac.uk", + { "United Kingdom #9", "ntp2d.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2d.mcc.ac.uk" }, - { "United Kingdom #9", "tick.tanac.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=tick.tanac.net" }, - { "U.S. AR", "sushi.compsci.lyon.edu", + { "U.S.", "us.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=us.pool.ntp.org" }, + { "U.S. AR", "sushi.lyon.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=sushi.compsci.lyon.edu" }, { "U.S. AZ", "ntp.drydog.com", @@ -1852,30 +1858,15 @@ DMenu MenuNTP = { { "U.S. NV #3", "tock.cs.unlv.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.cs.unlv.edu" }, - { "U.S. NY", "clock.linuxshell.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=clock.linuxshell.net" }, - { "U.S. NY #2", "ntp.ctr.columbia.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.ctr.columbia.edu" }, - { "U.S. NY #3", "ntp0.cornell.edu", + { "U.S. NY", "ntp0.cornell.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.cornell.edu" }, - { "U.S. NY #4", "ntp1.mpis.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp1.mpis.net" }, - { "U.S. NY #5", "ntp2.mpis.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2.mpis.net" }, - { "U.S. NY #6", "sundial.columbia.edu", + { "U.S. NY #2", "sundial.columbia.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=sundial.columbia.edu" }, - { "U.S. NY #7", "timex.cs.columbia.edu", + { "U.S. NY #3", "timex.cs.columbia.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timex.cs.columbia.edu" }, - { "U.S. OK", "constellation.ecn.uoknor.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=constellation.ecn.uoknor.edu" }, { "U.S. PA", "clock-1.cs.cmu.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock-1.cs.cmu.edu" }, @@ -1894,22 +1885,19 @@ DMenu MenuNTP = { { "U.S. PA #6", "ntp-2.ece.cmu.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp-2.ece.cmu.edu" }, - { "U.S. TX", "ntp.cox.smu.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.cox.smu.edu" }, - { "U.S. TX #2", "ntp.fnbhs.com", + { "U.S. TX", "ntp.fnbhs.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.fnbhs.com" }, - { "U.S. TX #3", "ntp.tmc.edu", + { "U.S. TX #2", "ntp.tmc.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.tmc.edu" }, - { "U.S. TX #4", "ntp5.tamu.edu", + { "U.S. TX #3", "ntp5.tamu.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp5.tamu.edu" }, - { "U.S. TX #5", "tick.greyware.com", + { "U.S. TX #4", "tick.greyware.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.greyware.com" }, - { "U.S. TX #6", "tock.greyware.com", + { "U.S. TX #5", "tock.greyware.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.greyware.com" }, { "U.S. VA", "ntp-1.vt.edu", @@ -1930,10 +1918,7 @@ DMenu MenuNTP = { { "U.S. VT #3", "ntp2.state.vt.us", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2.state.vt.us" }, - { "U.S. WA", "clock.tricity.wsu.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=clock.tricity.wsu.edu" }, - { "U.S. WA #2", "ntp.tcp-udp.net", + { "U.S. WA", "ntp.tcp-udp.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.tcp-udp.net" }, { "U.S. WI", "ntp1.cs.wisc.edu", @@ -1942,9 +1927,6 @@ DMenu MenuNTP = { { "U.S. WI #2", "ntp3.cs.wisc.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp3.cs.wisc.edu" }, - { "Venezuela", "ntp.linux.org.ve", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.linux.org.ve" }, { "South Africa", "ntp.cs.unp.ac.za", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.cs.unp.ac.za" }, diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 1bfad6343855..015419944bb4 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -1528,21 +1528,21 @@ DMenu MenuNTP = { { "Argentina #3", "tock.nap.com.ar", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.nap.com.ar" }, - { "Australia", "augean.eleceng.adelaide.edu.au", + { "Australia", "au.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=au.pool.ntp.org" }, + { "Australia #2", "augean.eleceng.adelaide.edu.au", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=augean.eleceng.adelaide.edu.au" }, - { "Australia #2", "ntp.adelaide.edu.au", + { "Australia #3", "ntp.adelaide.edu.au", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.adelaide.edu.au" }, - { "Australia #3", "ntp.saard.net", + { "Australia #4", "ntp.saard.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.saard.net" }, - { "Australia #4", "time.deakin.edu.au", + { "Australia #5", "time.deakin.edu.au", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.deakin.edu.au" }, - { "Australia #5", "time.esec.com.au", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=time.esec.com.au" }, { "Belgium", "ntp1.belbone.be", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.belbone.be" }, @@ -1561,28 +1561,31 @@ DMenu MenuNTP = { { "Brazil #4", "ntp1.pucpr.br", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.pucpr.br" }, - { "Canada", "ntp.cpsc.ucalgary.ca", + { "Canada", "ca.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ca.pool.ntp.org" }, + { "Canada #2", "ntp.cpsc.ucalgary.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.cpsc.ucalgary.ca" }, - { "Canada #2", "ntp1.cmc.ec.gc.ca", + { "Canada #3", "ntp1.cmc.ec.gc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.cmc.ec.gc.ca" }, - { "Canada #3", "ntp2.cmc.ec.gc.ca", + { "Canada #4", "ntp2.cmc.ec.gc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2.cmc.ec.gc.ca" }, - { "Canada #4", "tick.utoronto.ca", + { "Canada #5", "tick.utoronto.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.utoronto.ca" }, - { "Canada #5", "time.chu.nrc.ca", + { "Canada #6", "time.chu.nrc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.chu.nrc.ca" }, - { "Canada #6", "time.nrc.ca", + { "Canada #7", "time.nrc.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.nrc.ca" }, - { "Canada #7", "timelord.uregina.ca", + { "Canada #8", "timelord.uregina.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timelord.uregina.ca" }, - { "Canada #8", "tock.utoronto.ca", + { "Canada #9", "tock.utoronto.ca", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.utoronto.ca" }, { "Czech", "ntp.karpo.cz", @@ -1630,15 +1633,15 @@ DMenu MenuNTP = { { "Hungary", "time.kfki.hu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.kfki.hu" }, - { "Indonesia", "ntp.incaf.net", + { "Indonesia", "ntp.kim.lipi.go.id", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.incaf.net" }, + "ntpdate_enable=YES,ntpdate_flags=ntp.kim.lipi.go.id" }, { "Ireland", "ntp.maths.tcd.ie", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.maths.tcd.ie" }, - { "Italy", "ntps.net4u.it", + { "Italy", "it.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=" }, + "ntpdate_enable=YES,ntpdate_flags=it.pool.ntp.org" }, { "Japan", "ntp.jst.mfeed.ad.jp", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.jst.mfeed.ad.jp" }, @@ -1648,18 +1651,9 @@ DMenu MenuNTP = { { "Korea", "time.nuri.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=time.nuri.net" }, - { "Mexico", "ntp2a.audiotel.com.mx", + { "Mexico", "mx.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2a.audiotel.com.mx" }, - { "Mexico #2", "ntp2b.audiotel.com.mx", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2b.audiotel.com.mx" }, - { "Mexico #3", "ntp2c.audiotel.com.mx", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2c.audiotel.com.mx" }, - { "Nigeria", "ntp.supernet300.com", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.supernet300.com" }, + "ntpdate_enable=YES,ntpdate_flags=mx.pool.ntp.org" }, { "Netherlands", "ntp0.nl.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.nl.net" }, @@ -1690,27 +1684,36 @@ DMenu MenuNTP = { { "Poland", "info.cyf-kr.edu.pl", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=info.cyf-kr.edu.pl" }, - { "Portugal", "bug.fe.up.pt", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=bug.fe.up.pt" }, { "Romania", "ticks.roedu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ticks.roedu.net" }, - { "Russia", "ntp.psn.ru", + { "Russia", "ru.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ru.pool.ntp.org" }, + { "Russia #2", "ntp.psn.ru", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.psn.ru" }, - { "Russia #2", "sign.chg.ru", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=sign.chg.ru" }, - { "Sweden", "ntp.lth.se", + { "Sweden", "se.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=se.pool.ntp.org" }, + { "Sweden #2", "ntp.lth.se", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.lth.se" }, - { "Singapore", "ntp.shim.org", + { "Sweden #3", "ntp1.sp.se", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ntp1.sp.se" }, + { "Sweden #4", "ntp2.sp.se", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ntp2.sp.se" }, + { "Sweden #5", "ntp.kth.se", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=ntp.kth.se" }, + { "Singapore", "sg.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.shim.org" }, - { "Slovenia", "calvus.rzs-hm.si", + "ntpdate_enable=YES,ntpdate_flags=sg.pool.ntp.org" }, + { "Slovenia", "si.pool.ntp.org", dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=calvus.rzs-hm.si" }, + "ntpdate_enable=YES,ntpdate_flags=si.pool.ntp.org" }, { "Slovenia #2", "sizif.mf.uni-lj.si", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=sizif.mf.uni-lj.si" }, @@ -1726,34 +1729,37 @@ DMenu MenuNTP = { { "Scotland", "ntp.cs.strath.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.cs.strath.ac.uk" }, - { "United Kingdom", "ntp.exnet.com", + { "United Kingdom", "uk.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=uk.pool.ntp.org" }, + { "United Kingdom #2", "ntp.exnet.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.exnet.com" }, - { "United Kingdom #2", "ntp0.uk.uu.net", + { "United Kingdom #3", "ntp0.uk.uu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.uk.uu.net" }, - { "United Kingdom #3", "ntp1.uk.uu.net", + { "United Kingdom #4", "ntp1.uk.uu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp1.uk.uu.net" }, - { "United Kingdom #4", "ntp2.uk.uu.net", + { "United Kingdom #5", "ntp2.uk.uu.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2.uk.uu.net" }, - { "United Kingdom #5", "ntp2a.mcc.ac.uk", + { "United Kingdom #6", "ntp2a.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2a.mcc.ac.uk" }, - { "United Kingdom #6", "ntp2b.mcc.ac.uk", + { "United Kingdom #7", "ntp2b.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2b.mcc.ac.uk" }, - { "United Kingdom #7", "ntp2c.mcc.ac.uk", + { "United Kingdom #8", "ntp2c.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2c.mcc.ac.uk" }, - { "United Kingdom #8", "ntp2d.mcc.ac.uk", + { "United Kingdom #9", "ntp2d.mcc.ac.uk", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2d.mcc.ac.uk" }, - { "United Kingdom #9", "tick.tanac.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=tick.tanac.net" }, - { "U.S. AR", "sushi.compsci.lyon.edu", + { "U.S.", "us.pool.ntp.org", + dmenuVarsCheck, dmenuSetVariables, NULL, + "ntpdate_enable=YES,ntpdate_flags=us.pool.ntp.org" }, + { "U.S. AR", "sushi.lyon.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=sushi.compsci.lyon.edu" }, { "U.S. AZ", "ntp.drydog.com", @@ -1852,30 +1858,15 @@ DMenu MenuNTP = { { "U.S. NV #3", "tock.cs.unlv.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.cs.unlv.edu" }, - { "U.S. NY", "clock.linuxshell.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=clock.linuxshell.net" }, - { "U.S. NY #2", "ntp.ctr.columbia.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.ctr.columbia.edu" }, - { "U.S. NY #3", "ntp0.cornell.edu", + { "U.S. NY", "ntp0.cornell.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp0.cornell.edu" }, - { "U.S. NY #4", "ntp1.mpis.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp1.mpis.net" }, - { "U.S. NY #5", "ntp2.mpis.net", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp2.mpis.net" }, - { "U.S. NY #6", "sundial.columbia.edu", + { "U.S. NY #2", "sundial.columbia.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=sundial.columbia.edu" }, - { "U.S. NY #7", "timex.cs.columbia.edu", + { "U.S. NY #3", "timex.cs.columbia.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=timex.cs.columbia.edu" }, - { "U.S. OK", "constellation.ecn.uoknor.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=constellation.ecn.uoknor.edu" }, { "U.S. PA", "clock-1.cs.cmu.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=clock-1.cs.cmu.edu" }, @@ -1894,22 +1885,19 @@ DMenu MenuNTP = { { "U.S. PA #6", "ntp-2.ece.cmu.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp-2.ece.cmu.edu" }, - { "U.S. TX", "ntp.cox.smu.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.cox.smu.edu" }, - { "U.S. TX #2", "ntp.fnbhs.com", + { "U.S. TX", "ntp.fnbhs.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.fnbhs.com" }, - { "U.S. TX #3", "ntp.tmc.edu", + { "U.S. TX #2", "ntp.tmc.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.tmc.edu" }, - { "U.S. TX #4", "ntp5.tamu.edu", + { "U.S. TX #3", "ntp5.tamu.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp5.tamu.edu" }, - { "U.S. TX #5", "tick.greyware.com", + { "U.S. TX #4", "tick.greyware.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tick.greyware.com" }, - { "U.S. TX #6", "tock.greyware.com", + { "U.S. TX #5", "tock.greyware.com", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=tock.greyware.com" }, { "U.S. VA", "ntp-1.vt.edu", @@ -1930,10 +1918,7 @@ DMenu MenuNTP = { { "U.S. VT #3", "ntp2.state.vt.us", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp2.state.vt.us" }, - { "U.S. WA", "clock.tricity.wsu.edu", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=clock.tricity.wsu.edu" }, - { "U.S. WA #2", "ntp.tcp-udp.net", + { "U.S. WA", "ntp.tcp-udp.net", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.tcp-udp.net" }, { "U.S. WI", "ntp1.cs.wisc.edu", @@ -1942,9 +1927,6 @@ DMenu MenuNTP = { { "U.S. WI #2", "ntp3.cs.wisc.edu", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp3.cs.wisc.edu" }, - { "Venezuela", "ntp.linux.org.ve", - dmenuVarsCheck, dmenuSetVariables, NULL, - "ntpdate_enable=YES,ntpdate_flags=ntp.linux.org.ve" }, { "South Africa", "ntp.cs.unp.ac.za", dmenuVarsCheck, dmenuSetVariables, NULL, "ntpdate_enable=YES,ntpdate_flags=ntp.cs.unp.ac.za" },