diff options
author | Marco d'Itri <md@linux.it> | 2003-05-05 18:14:46 +0200 |
---|---|---|
committer | Marco d'Itri <md@linux.it> | 2013-03-30 02:31:30 +0100 |
commit | cc470e6784549c87fa28ba140ab95a3152ceb6c6 (patch) | |
tree | 5233dfd89881be30c896954100e07eb0602f0ca6 | |
parent | 570afc2396627f4c6e78b0e7bc9987ac5d30581a (diff) | |
download | whois-cc470e6784549c87fa28ba140ab95a3152ceb6c6.tar.gz |
Imported Debian version 4.6.5v4.6.5
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | whois.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index aea65dc..d3607ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -whois (4.6.4) unstable; urgency=medium +whois (4.6.5) unstable; urgency=medium * Added may new ASN blocks from MILNET, LACNIC and JP-NIC. * Fixed a bug which broke ASN queries to whois.nic.mil. @@ -428,13 +428,11 @@ char *queryformat(const char *server, const char *flags, const char *query) puts(_("Warning: RIPE flags used with a traditional server.")); strcat(buf, flags); } - if (!isripe && strcmp(server, "whois.nic.mil") == 0 && + /* FIXME: /e is not applied to .JP ASN */ + if (!isripe && (strcmp(server, "whois.nic.mil") == 0 || + strcmp(server, "whois.nic.ad.jp") == 0) && strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2])) sprintf(buf, "AS %s", query + 2); /* fix query for DDN */ - else if (!isripe && (strcmp(server, "whois.arin.net") == 0 || - strcmp(server, "whois.nic.ad.jp")) && - strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2])) - sprintf(buf, "AS %s", query + 2); /* always ask for a ASN */ else if (!isripe && strcmp(server, "whois.corenic.net") == 0) sprintf(buf, "--machine %s", query); /* machine readable output */ else if (!isripe && strcmp(server, "whois.nic.ad.jp") == 0) { |