Imported Debian version 4.7.2

This commit is contained in:
Marco d'Itri 2005-03-24 14:33:10 +01:00
parent ec5ce735c6
commit 64ad70cad1
6 changed files with 16 additions and 7 deletions

1
data.h
View File

@ -16,7 +16,6 @@ const char *ripe_servers[] = {
"whois.nic.fr",
"whois.nic.it",
"whois.telstra.net",
"whois.metu.edu.tr",
"whois.restena.lu",
"rr.level3.net", /* 3.0.0a13 */
"whois.ripn.net",

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
whois (4.7.2) unstable; urgency=high
* whois.metu.edu.tr does not accept anymore RIPE-like queries.
* Updated the .bg and .jp TLD servers. (Closes: #301187)
* Updated the IPv4 allocations.
-- Marco d'Itri <md@linux.it> Thu, 24 Mar 2005 14:33:10 +0100
whois (4.7.1) unstable; urgency=medium
* Added new ASN allocations.

View File

@ -151,6 +151,8 @@
211.176.0.0/12 whois.nic.or.kr
211.192.0.0/10 whois.nic.or.kr # => 211.255.255.255
210.0.0.0/7 apnic
213.154.32.0/19 afrinic
213.154.64.0/19 afrinic
212.0.0.0/7 ripe
214.0.0.0/7 arin # DoD
216.0.0.0/8 arin

View File

@ -59,7 +59,7 @@
.bd NONE # http://www.bttb.net/
.be whois.dns.be
.bf NONE # NIC? http://www.onatel.bf/
.bg whois.ripe.net
.bg whois.register.bg
#.bh NONE # NIC? www.inet.com.bh
.bi WEB http://www.nic.bi/Nic_search.asp
#.bj # NIC? www.opt.bj
@ -151,7 +151,7 @@
.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.nic.ad.jp
.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/

View File

@ -81,7 +81,8 @@ current system locale and converted to the IDN ASCII Compatible Encoding.
/etc/whois.conf
.SH "ENVIRONMENT"
.IP LANG
When querying \fIwhois.nic.ad.jp\fP english text is requested unless the
When querying \fIwhois.nic.ad.jp\fP and \fIwhois.jprs.jp\fP english text
is requested unless the
\fILANG\fP environment variable specifies a Japanese locale.
.IP "WHOIS_SERVER"
This server will be queried if the program cannot guess where some kind

View File

@ -379,8 +379,6 @@ const char *whichwhois(const char *s)
if (strncasecmp(s, "as", 2) == 0 && /* it's an AS */
(isasciidigit(s[2]) || s[2] == ' '))
return whereas(atoi(s + 2));
else if (strncasecmp(p - 2, "jp", 2) == 0) /* JP NIC handle */
return "whois.nic.ad.jp";
if (*s == '!') /* NSI NIC handle */
return "whois.networksolutions.com";
else
@ -461,7 +459,8 @@ char *queryformat(const char *server, const char *flags, const char *query)
strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2]))
/* FIXME: /e is not applied to .JP ASN */
sprintf(buf, "AS %s", query + 2); /* fix query for DDN */
else if (!isripe && strcmp(server, "whois.nic.ad.jp") == 0) {
else if (!isripe && (strcmp(server, "whois.nic.ad.jp") == 0 ||
strcmp(server, "whois.jprs.jp") == 0)) {
char *lang = getenv("LANG"); /* not a perfect check, but... */
if (!lang || (strncmp(lang, "ja", 2) != 0))
sprintf(buf, "%s/e", query); /* ask for english text */