From cc470e6784549c87fa28ba140ab95a3152ceb6c6 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Mon, 5 May 2003 18:14:46 +0200 Subject: [PATCH] Imported Debian version 4.6.5 --- debian/changelog | 2 +- 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. diff --git a/whois.c b/whois.c index 3289c98..3d65c59 100644 --- a/whois.c +++ b/whois.c @@ -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) {