summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h2
-rw-r--r--data.h1
-rw-r--r--debian/changelog11
-rw-r--r--ip_del_list7
-rw-r--r--tld_serv_list2
-rw-r--r--whois.c3
-rw-r--r--whois.spec2
7 files changed, 20 insertions, 8 deletions
diff --git a/config.h b/config.h
index 8e98d2d..eee8946 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
/* Program version */
/* not for the inetutils version */
-#define VERSION "4.7.20"
+#define VERSION "4.7.21"
/* Configurable features */
diff --git a/data.h b/data.h
index edf9f14..895251a 100644
--- a/data.h
+++ b/data.h
@@ -14,7 +14,6 @@ const char *ripe_servers[] = {
"whois.6bone.net", /* 3.0.0b1 */
"whois.connect.com.au", /* 3.0.0b1 */
"whois.nic.fr",
- "whois.nic.it",
"whois.telstra.net",
"whois.restena.lu",
"rr.level3.net", /* 3.0.0a13 */
diff --git a/debian/changelog b/debian/changelog
index f0a93cc..bdde4ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+whois (4.7.21) unstable; urgency=medium
+
+ * Improved myinet_aton to not parse addresses with trailing junk
+ * Added APNIC and RIPE allocations.
+ * Updated the name of the Verio whois server. (Closes: #410449)
+ * Removed references to whois.nic.mil, which apparently is gone.
+ * Removed whois.nic.it from ripe_servers, because it does not even
+ pretend to be one anymore.
+
+ -- Marco d'Itri <md@linux.it> Mon, 02 Apr 2007 04:23:45 +0200
+
whois (4.7.20) unstable; urgency=medium
* Added more krnic allocations.
diff --git a/ip_del_list b/ip_del_list
index 553eb36..50e6a7f 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -24,10 +24,11 @@
78.0.0.0/7 ripe
80.0.0.0/5 ripe # => 87.255.255.255
88.0.0.0/6 ripe # => 91.255.255.254
+92.0.0.0/7 ripe
+116.0.0.0/6 apnic
121.128.0.0/10 whois.nic.or.kr
-121.0.0.0/8 apnic
-122.0.0.0/7 apnic
125.128.0.0/11 whois.nic.or.kr
+120.0.0.0/6 apnic
124.0.0.0/7 apnic
126.0.0.0/8 apnic
96.0.0.0/6 arin
@@ -138,7 +139,7 @@
203.180.0.0/14 whois.nic.ad.jp
203.224.0.0/11 whois.nic.or.kr # => 203.255.255.255
202.0.0.0/7 apnic
-204.0.0.0/14 verio # rwhois too
+204.0.0.0/14 rwhois.gin.ntt.net # rwhois too
204.0.0.0/6 arin
208.0.0.0/7 arin
209.94.192.0/19 lacnic
diff --git a/tld_serv_list b/tld_serv_list
index 81a75ab..d3c762d 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -28,7 +28,7 @@
.edu whois.educause.net
.gov whois.nic.gov
.int whois.iana.org
-.mil whois.nic.mil
+.mil NONE
.aero whois.information.aero
e164.arpa whois.ripe.net
.arpa whois.iana.org
diff --git a/whois.c b/whois.c
index adeae0e..a8be51b 100644
--- a/whois.c
+++ b/whois.c
@@ -865,10 +865,11 @@ char *convert_teredo(const char *s)
unsigned long myinet_aton(const char *s)
{
unsigned long a, b, c, d;
+ char junk;
if (!s)
return 0;
- if (sscanf(s, "%lu.%lu.%lu.%lu", &a, &b, &c, &d) != 4)
+ if (sscanf(s, "%lu.%lu.%lu.%lu%c", &a, &b, &c, &d, &junk) != 4)
return 0;
if (a > 255 || b > 255 || c > 255 || d > 255)
return 0;
diff --git a/whois.spec b/whois.spec
index 103c5b4..1ee6093 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
Summary: Enhanced WHOIS client
Name: whois
-Version: 4.7.20
+Version: 4.7.21
Release: 1
License: GPL
Vendor: Marco d'Itri <md@linux.it>