diff --git a/config.h b/config.h index 99a5ea7..f721991 100644 --- a/config.h +++ b/config.h @@ -1,6 +1,6 @@ /* Program version */ /* not for the inetutils version */ -#define VERSION "4.7.14" +#define VERSION "4.7.15" /* Configurable features */ diff --git a/debian/changelog b/debian/changelog index f4725b2..511bc37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +whois (4.7.15) unstable; urgency=high + + * Fixed the parsing of hostname+port, which was broken by 4.7.14. + * Added the .gp, .ni and .tn TLD servers. + * Updated the .bh, .bn, .ec, .gy, .im, .kw, .mu, .ph, .pr, .py, .ve and .vu + TLD servers. + + -- Marco d'Itri Wed, 19 Jul 2006 21:01:32 +0200 + whois (4.7.14) unstable; urgency=medium * Added the .coop, .mobi TLD and e164.arpa servers. diff --git a/tld_serv_list b/tld_serv_list index 76a7367..6145e8c 100644 --- a/tld_serv_list +++ b/tld_serv_list @@ -65,17 +65,17 @@ e164.arpa whois.ripe.net .be whois.dns.be .bf NONE # NIC? http://www.onatel.bf/ .bg whois.register.bg -#.bh NONE # NIC? www.inet.com.bh +.bh NONE # www.inet.com.bh .bi WEB http://www.nic.bi/Nic_search.asp .bj whois.nic.bj .bm WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO -#.bn NONE # NIC? www.brunet.bn +.bn NONE # www.brunet.bn .bo WEB http://www.nic.bo/ .br whois.nic.br .bs WEB http://www.nic.bs/cgi-bin/search.pl .bt WEB http://www.nic.bt/ .bv NONE # http://www.norid.no/domenenavnbaser/bv-sj.html -#.bw # NIC? www.botsnet.bw btc.bw +#.bw # NIC? btc.bw www.info.bw/resource/local/index.shtml .by WEB http://www.tld.by/indexeng.html .bz whois.belizenic.bz .ca whois.cira.ca @@ -104,7 +104,7 @@ e164.arpa whois.ripe.net .dm whois.nic.dm .do WEB http://www.nic.do/whois-h.php3 .dz WEB http://www.nic.dz/anglais/dom-attr-eng.htm -.ec WEB http://www.nic.ec/eng/nicec.htm +.ec WEB http://www.nic.ec/whois/eng/whois.asp .ee whois.eenet.ee .eg NONE # http://www.ise.org.eg/domain.htm http://www.frcu.eun.eg/docs-n/e-dns.php #.eh @@ -130,14 +130,14 @@ e164.arpa whois.ripe.net .gl NONE # www.nic.gl .gm whois.ripe.net # www.nic.gm .gn NONE # http://www.psg.com/dns/gn/ -#.gp # www.nic.gp broken -#.gq # NO NIC http://www.intnet.gq/ http://www.getesa.gq/ +.gp whois.nic.gp +#.gq # NO NIC http://www.getesa.gq/ .gr WEB https://grweb.ics.forth.gr/Whois?lang=en .gs whois.adamsnames.tc .gt WEB http://www.gt/whois.htm .gu WEB http://gadao.gov.gu/domainsearch.htm #.gw # no NIC? -#.gy # NIC? (UPR) +.gy NONE # http://www.uog.edu.gy/domain/cit.html .hk whois.hkdnr.net.hk .hm whois.registry.hm .hn NONE # http://www.nic.hn/busquedas/ @@ -147,16 +147,16 @@ e164.arpa whois.ripe.net .id whois.idnic.net.id .ie whois.domainregistry.ie .il whois.isoc.org.il -.im WEB http://www.nic.im/exist.html +.im WEB http://www.nic.im/public/whois.mth .in whois.registry.in .io whois.nic.io -#.iq # see http://nic-iq.nic-naa.net/ +#.iq # NIC? .ir whois.nic.ir .is whois.isnet.is .it whois.nic.it .je whois.channelisles.net #.jm # NIC? uwimona.edu.jm http://nic.jm -.jo WEB http://www.nis.jo/dns/ # old: http://amon.nic.gov.jo/dns/ +.jo WEB http://www.nis.jo/dns/ .jp whois.jprs.jp .ke whois.kenic.or.ke .kg whois.domain.kg @@ -166,12 +166,12 @@ e164.arpa whois.ripe.net #.kn # NO NIC (UPR) #.kp .kr whois.nic.or.kr -.kw WEB http://www.domainname.net.kw +.kw WEB http://www.kw/ .ky WEB http://kynseweb.messagesecure.com/kywebadmin/ # http://www.icta.ky/ .kz whois.nic.kz .la whois.nic.la .lb WEB http://www.aub.edu.lb/lbdr/search.html -.lc NONE # http://www.isisworld.lc/domains/ +.lc NONE # NO NIC? UPR (was http://www.isisworld.lc/domains/) .li whois.nic.li .lk whois.nic.lk .lr NONE # http://www.psg.com/dns/lr/ @@ -192,10 +192,10 @@ e164.arpa whois.ripe.net .mo WEB http://www.monic.net.mo/ .mp NONE # www.nic.mp #.mq # www.nic.mq broken -.mr NONE # http://www.univ-nkc.mr/nic_mr.html +.mr NONE # http://www.univ-nkc.mr/nic_mr.html www.nic.mr ? .ms whois.adamsnames.tc .mt WEB http://www.nic.org.mt/dir/home.html -.mu WEB http://www.nic.mu/mauritius/domain.whois.php +.mu WEB http://www.nic.mu/whois.jsp #.mv # NIC? www.dhiraagu.com.mv .mw WEB http://www.registrar.mw/ .mx whois.nic.mx @@ -206,7 +206,7 @@ e164.arpa whois.ripe.net #.ne # NIC? http://www.intnet.ne .nf whois.nic.nf .ng NONE # http://psg.com/dns/ng/ -.ni NONE # www.nic.ni +.ni WEB http://www.nic.ni/consulta.htm .nl whois.domain-registry.nl .no whois.norid.no .np WEB http://www.mos.com.np/domsearch.html @@ -218,17 +218,17 @@ e164.arpa whois.ripe.net .pe whois.nic.pe #.pf # NIC? mana.pf .pg NONE # http://www.npi.gov.pg/DNS/DNS-Application-form.htm -.ph WEB http://www.domains.ph/DomainSearch.asp +.ph WEB http://whois.domains.ph/ .pk WEB http://www.pknic.net.pk/ .co.pl whois.co.pl # "unofficial" SLD .pl whois.dns.pl .pm whois.nic.fr .pn WEB http://www.pitcairn.pn/PnRegistry/CheckAvailability.html -.pr WEB http://www.nic.pr/domain/whois.asp +.pr WEB http://whois.nic.pr/ .ps WEB http://www.nic.ps/whois/whois.html .pt whois.dns.pt .pw whois.nic.pw -.py WEB http://www.nic.py/consultas/ +.py WEB http://www.nic.py/consultas.html .qa NONE # http://www.qatar.net.qa/services/virtual.htm .re whois.nic.fr .ro whois.rotld.ro @@ -264,7 +264,7 @@ e164.arpa whois.ripe.net .tk whois.dot.tk .tl whois.nic.tl .tm whois.nic.tm -.tn NONE # http://www.ati.tn/Nic/ +.tn WEB http://whois.ati.tn/ .to whois.tonic.to .tp whois.nic.tp .tr whois.metu.edu.tr @@ -285,11 +285,11 @@ e164.arpa whois.ripe.net .uz whois.cctld.uz .va whois.ripe.net .vc whois.opensrs.net -.ve WEB http://www.nic.ve/ # rwhois.reacciun.ve:4321 +.ve whois.nic.ve .vg whois.adamsnames.tc .vi WEB http://www.nic.vi/whoisform.htm .vn WEB http://www.vnnic.net.vn/english/reg_domain/ -.vu WEB http://www.vunic.vu/whois.htm +.vu WEB http://www.vunic.vu/whois.html .wf whois.nic.wf .ws whois.samoanic.ws #.ye # NIC? www.y.net.ye diff --git a/whois-4.7.14/tld_serv_list b/whois-4.7.14/tld_serv_list new file mode 100644 index 0000000..76a7367 --- /dev/null +++ b/whois-4.7.14/tld_serv_list @@ -0,0 +1,340 @@ +# NIC? means I have not been able to find the registry +# UPR means the TLD is managed by UPR, but I could not find any info +# +.br.com whois.centralnic.net +.cn.com whois.centralnic.net +.de.com whois.centralnic.net +.eu.com whois.centralnic.net +.gb.com whois.centralnic.net +.gb.net whois.centralnic.net +.hu.com whois.centralnic.net +.no.com whois.centralnic.net +.qc.com whois.centralnic.net +.ru.com whois.centralnic.net +.sa.com whois.centralnic.net +.se.com whois.centralnic.net +.se.net whois.centralnic.net +.uk.com whois.centralnic.net +.uk.net whois.centralnic.net +.us.com whois.centralnic.net +.uy.com whois.centralnic.net +.za.com whois.centralnic.net +.jpn.com whois.centralnic.net +.web.com whois.centralnic.net +.eu.org whois.eu.org +.com CRSNIC +.net CRSNIC +.org PIR +.edu whois.educause.net +.gov whois.nic.gov +.int whois.iana.org +.mil whois.nic.mil +.aero whois.information.aero +e164.arpa whois.ripe.net +.arpa whois.iana.org +.biz whois.nic.biz +.cat whois.cat +.coop whois.nic.coop +.info whois.afilias.info +.jobs whois.jobs +.mobi WEB http://pc.mtld.mobi/whois/ +.museum whois.museum +.name whois.nic.name +.pro whois.registrypro.pro +.travel whois.nic.travel +.ac whois.nic.ac +.ad NONE # www.nic.ad +.ae whois.uaenic.ae +.af whois.nic.af +.ag whois.nic.ag +.ai WEB http://whois.offshore.ai/ +.al NONE # http://www.inima.al/Domains.html +.am whois.nic.am +.an NONE # http://www.una.net/an_domreg/ +.ao NONE # www.dns.ao +.aq NONE # 2day.com +.ar WEB http://www.nic.ar/ +.as whois.nic.as +.at whois.nic.at +.au whois.ausregistry.net.au +.aw NONE # www.setarnet.aw +.az WEB http://www.nic.az/AzCheck.htm +.ba WEB http://www.nic.ba/stream/whois/ +.bb WEB http://domains.org.bb/regsearch/ +.bd NONE # http://www.bttb.net/home/main/internet/dot-bd-faq.htm +.be whois.dns.be +.bf NONE # NIC? http://www.onatel.bf/ +.bg whois.register.bg +#.bh NONE # NIC? www.inet.com.bh +.bi WEB http://www.nic.bi/Nic_search.asp +.bj whois.nic.bj +.bm WEB http://207.228.133.14/cgi-bin/lansaweb?procfun+BMWHO+BMWHO2+WHO +#.bn NONE # NIC? www.brunet.bn +.bo WEB http://www.nic.bo/ +.br whois.nic.br +.bs WEB http://www.nic.bs/cgi-bin/search.pl +.bt WEB http://www.nic.bt/ +.bv NONE # http://www.norid.no/domenenavnbaser/bv-sj.html +#.bw # NIC? www.botsnet.bw btc.bw +.by WEB http://www.tld.by/indexeng.html +.bz whois.belizenic.bz +.ca whois.cira.ca +.cc NICCC +.cd whois.nic.cd +.cf NONE # was: WEB http://www.nic.cf/whois.php3 +.cg WEB http://www.nic.cg/cgi-bin/whois.pl +.ch whois.nic.ch +.ci www.nic.ci +.ck whois.nic.ck +.cl whois.nic.cl +.cm NONE # http://info.intelcam.cm http://www.camnet.cm/ +.edu.cn whois.edu.cn +.cn whois.cnnic.net.cn +.uk.co whois.uk.co +.co WEB https://www.nic.co/ +.cr WEB http://www.nic.cr/servlet/niccr?tid=TWhois&Lng=5&Act=NEW +.cu WEB http://www.nic.cu/consult.html +.cv NONE # www.dns.cv? +.cx whois.nic.cx +.cy WEB http://www.nic.cy/nslookup/online_database.php +.cz whois.nic.cz +.de whois.denic.de +.dj whois.domain.dj +.dk whois.dk-hostmaster.dk +.dm whois.nic.dm +.do WEB http://www.nic.do/whois-h.php3 +.dz WEB http://www.nic.dz/anglais/dom-attr-eng.htm +.ec WEB http://www.nic.ec/eng/nicec.htm +.ee whois.eenet.ee +.eg NONE # http://www.ise.org.eg/domain.htm http://www.frcu.eun.eg/docs-n/e-dns.php +#.eh +.er NONE # http://www.afridns.org/er/tld_er.txt +.es WEB https://www.nic.es/ +#.et NONE # http://www.telecom.net.et/EthioInternet/domainname.html +.eu whois.eu +.fi whois.ficora.fi +.fj whois.usp.ac.fj +.fk NONE # http://www.fidc.org.fk/ +.fm WEB http://www.dot.fm/whois.html +.fo whois.ripe.net # www.nic.fo +.fr whois.nic.fr +#.fx +.ga NONE # www.nic.ga +.gb NONE +#.gd # NO NIC (UPR) +.ge WEB http://whois.sanet.ge/ +.gf whois.nplus.gf +.gg whois.channelisles.net +.gh NONE # http://www.ghana.com.gh/domain.htm +.gi WEB http://whois.gibnet.gi/ +.gl NONE # www.nic.gl +.gm whois.ripe.net # www.nic.gm +.gn NONE # http://www.psg.com/dns/gn/ +#.gp # www.nic.gp broken +#.gq # NO NIC http://www.intnet.gq/ http://www.getesa.gq/ +.gr WEB https://grweb.ics.forth.gr/Whois?lang=en +.gs whois.adamsnames.tc +.gt WEB http://www.gt/whois.htm +.gu WEB http://gadao.gov.gu/domainsearch.htm +#.gw # no NIC? +#.gy # NIC? (UPR) +.hk whois.hkdnr.net.hk +.hm whois.registry.hm +.hn NONE # http://www.nic.hn/busquedas/ +.hr WEB http://www.dns.hr/pretrazivanje.html +.ht WEB http://www.nic.ht/info/whois.cfm +.hu whois.nic.hu +.id whois.idnic.net.id +.ie whois.domainregistry.ie +.il whois.isoc.org.il +.im WEB http://www.nic.im/exist.html +.in whois.registry.in +.io whois.nic.io +#.iq # see http://nic-iq.nic-naa.net/ +.ir whois.nic.ir +.is whois.isnet.is +.it whois.nic.it +.je whois.channelisles.net +#.jm # NIC? uwimona.edu.jm http://nic.jm +.jo WEB http://www.nis.jo/dns/ # old: http://amon.nic.gov.jo/dns/ +.jp whois.jprs.jp +.ke whois.kenic.or.ke +.kg whois.domain.kg +.kh NONE # http://www.mptc.gov.kh/ http://www.nic.net.kh/ +.ki WEB http://www.ki/dns/ +.km NONE # NO NIC +#.kn # NO NIC (UPR) +#.kp +.kr whois.nic.or.kr +.kw WEB http://www.domainname.net.kw +.ky WEB http://kynseweb.messagesecure.com/kywebadmin/ # http://www.icta.ky/ +.kz whois.nic.kz +.la whois.nic.la +.lb WEB http://www.aub.edu.lb/lbdr/search.html +.lc NONE # http://www.isisworld.lc/domains/ +.li whois.nic.li +.lk whois.nic.lk +.lr NONE # http://www.psg.com/dns/lr/ +.ls NONE # http://www.co.ls/ +.lt whois.domreg.lt +.lu whois.dns.lu +.lv whois.nic.lv +.ly WEB http://www.lydomains.com/ +#.ma # NIC? http://www.anrt.net.ma/nic/ +.mc whois.ripe.net +.md WEB http://www.dns.md/whois.html +.mg NONE # www.nic.mg +.mh NONE # www.nic.net.mh +#.mk # NIC? http://www.mpt.com.mk +#.ml # NIC? www.sotelma.ml +.mm whois.nic.mm +.mn whois.nic.mn +.mo WEB http://www.monic.net.mo/ +.mp NONE # www.nic.mp +#.mq # www.nic.mq broken +.mr NONE # http://www.univ-nkc.mr/nic_mr.html +.ms whois.adamsnames.tc +.mt WEB http://www.nic.org.mt/dir/home.html +.mu WEB http://www.nic.mu/mauritius/domain.whois.php +#.mv # NIC? www.dhiraagu.com.mv +.mw WEB http://www.registrar.mw/ +.mx whois.nic.mx +.my whois.mynic.net.my +#.mz # NIC? www.uem.mz +.na whois.na-nic.com.na +.nc whois.cctld.nc +#.ne # NIC? http://www.intnet.ne +.nf whois.nic.nf +.ng NONE # http://psg.com/dns/ng/ +.ni NONE # www.nic.ni +.nl whois.domain-registry.nl +.no whois.norid.no +.np WEB http://www.mos.com.np/domsearch.html +.nr WEB http://www.cenpac.net.nr/dns/whois.html +.nu whois.nic.nu +.nz whois.srs.net.nz +#.om NONE # NIC? http://www.gto.net.om http://www.omantel.net.om/ +.pa WEB http://www.nic.pa/ +.pe whois.nic.pe +#.pf # NIC? mana.pf +.pg NONE # http://www.npi.gov.pg/DNS/DNS-Application-form.htm +.ph WEB http://www.domains.ph/DomainSearch.asp +.pk WEB http://www.pknic.net.pk/ +.co.pl whois.co.pl # "unofficial" SLD +.pl whois.dns.pl +.pm whois.nic.fr +.pn WEB http://www.pitcairn.pn/PnRegistry/CheckAvailability.html +.pr WEB http://www.nic.pr/domain/whois.asp +.ps WEB http://www.nic.ps/whois/whois.html +.pt whois.dns.pt +.pw whois.nic.pw +.py WEB http://www.nic.py/consultas/ +.qa NONE # http://www.qatar.net.qa/services/virtual.htm +.re whois.nic.fr +.ro whois.rotld.ro +.edu.ru whois.informika.ru +.ru whois.ripn.net +.rw WEB http://www.nic.rw/cgi-bin/whoisrw.pl +.sa saudinic.net.sa +.sb whois.nic.net.sb +.sc NONE # www.nic.sc +.sd NONE # http://sudanic.isoc.sd/ +.se whois.nic-se.se +.sg whois.nic.net.sg +.sh whois.nic.sh +.si whois.arnes.si +.sj NONE # http://www.norid.no/domenenavnbaser/bv-sj.html +.sk whois.sk-nic.sk +.sl NONE # http://www.sierratel.sl/domain/ +.sm whois.ripe.net +.sn WEB www.nic.sn +.so NONE # www.nic.so - no country, no NIC +.sr whois.register.sr +.st whois.nic.st +.su whois.ripn.net +.sv WEB http://www.uca.edu.sv/dns/ # http://www.svnet.org.sv/ +#.sy # NIC? www.ste.gov.sy +.sz NONE # http://www.sispa.org.sz/ +.tc whois.adamsnames.tc +.td WEB http://www.nic.td/ +.tf whois.nic.tf +.tg WEB http://www.nic.tg/ +.th whois.thnic.net +.tj whois.nic.tj +.tk whois.dot.tk +.tl whois.nic.tl +.tm whois.nic.tm +.tn NONE # http://www.ati.tn/Nic/ +.to whois.tonic.to +.tp whois.nic.tp +.tr whois.metu.edu.tr +.tt WEB http://www.nic.tt/cgi-bin/search.pl +.tv whois.nic.tv +.tw whois.twnic.net +.tz NONE # http://www.psg.com/dns/tz/ +.ua whois.net.ua +.ug www.registry.co.ug # this is a whois server too +.gov.uk whois.ja.net +.ac.uk whois.ja.net +.uk whois.nic.uk +.um NONE # www.nic.um +.fed.us whois.nic.gov +.us whois.nic.us +.com.uy WEB http://dns.antel.net.uy/clientes/consultar.htm +.uy www.rau.edu.uy # this is a whois server too +.uz whois.cctld.uz +.va whois.ripe.net +.vc whois.opensrs.net +.ve WEB http://www.nic.ve/ # rwhois.reacciun.ve:4321 +.vg whois.adamsnames.tc +.vi WEB http://www.nic.vi/whoisform.htm +.vn WEB http://www.vnnic.net.vn/english/reg_domain/ +.vu WEB http://www.vunic.vu/whois.htm +.wf whois.nic.wf +.ws whois.samoanic.ws +#.ye # NIC? www.y.net.ye +.yt whois.nic.yt +.yu NONE # www.nic.yu +.ac.za whois.ac.za +.co.za WEB http://whois.co.za/ +.gov.za whois.gov.za +#.net.za whois.net.za +.org.za WEB http://www.org.za/ # rwhois.org.za:4321 +.za NONE # http://www.internet.org.za/slds.html many more SLD... +.zm NONE # NIC? http://www.zamnet.zm/ +.zw NONE # http://www.zispa.co.zw/ +-dom whois.networksolutions.com +-org whois.networksolutions.com +-hst whois.networksolutions.com +-arin whois.arin.net +-ripe whois.ripe.net +-mnt whois.ripe.net +-lacnic whois.lacnic.net +-afrinic whois.afrinic.net +-ap whois.apnic.net +-ar whois.aunic.net +-cn whois.cnnic.net.cn +-cz whois.nic.cz +-dk whois.dk-hostmaster.dk +-il whois.isoc.org.il +-is whois.isnet.is +-kg whois.domain.kg +-ti whois.telstra.net +-tw whois.twnic.net +-6bone whois.6bone.net +-coop whois.nic.coop +-cknic whois.nic.ck +-idnic whois.idnic.net.id +-itnic whois.nic.it +-frnic whois.nic.fr +-gandi whois.gandi.net +-lrms whois.afilias.net +-metu whois.metu.edu.tr +-nicat whois.nic.at +-nicir whois.nic.ir +-norid whois.norid.no +-ripn whois.ripn.net +-rotld whois.rotld.ro +-sgnic whois.nic.net.sg +-uanic whois.com.ua +-uynic www.rau.edu.uy diff --git a/whois.c b/whois.c index 73c1485..3d52e72 100644 --- a/whois.c +++ b/whois.c @@ -802,7 +802,7 @@ void split_server_port(const char *const input, if (p && *(p + 1) != '\0') *port = strdup(p + 1); /* IPv6 + port */ } else if ((p = strchr(input, ':')) && /* IPv6, no port */ - strchr(p, ':')) { /* and no brackets */ + strchr(p + 1, ':')) { /* and no brackets */ *server = strdup(input); } else if ((p = strchr(input, ':'))) { /* IPv4 + port */ char *s; @@ -812,8 +812,9 @@ void split_server_port(const char *const input, memcpy(s, input, len); *(s + len) = '\0'; - if (*(p + 1) != '\0') - *port = strdup(p + 1); + p++; + if (*p != '\0') + *port = strdup(p); } else { /* IPv4, no port */ *server = strdup(input); } diff --git a/whois.spec b/whois.spec index 81d7ced..87d240d 100644 --- a/whois.spec +++ b/whois.spec @@ -1,6 +1,6 @@ Summary: Enhanced WHOIS client Name: whois -Version: 4.7.14 +Version: 4.7.15 Release: 1 License: GPL Vendor: Marco d'Itri