From owner-svn-src-all@freebsd.org  Thu Mar 31 12:13:03 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 196CEAE22EF;
 Thu, 31 Mar 2016 12:13:03 +0000 (UTC)
 (envelope-from fanf@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD3201E56;
 Thu, 31 Mar 2016 12:13:02 +0000 (UTC)
 (envelope-from fanf@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2VCD2DR073316;
 Thu, 31 Mar 2016 12:13:02 GMT (envelope-from fanf@FreeBSD.org)
Received: (from fanf@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2VCD2hq073315;
 Thu, 31 Mar 2016 12:13:02 GMT (envelope-from fanf@FreeBSD.org)
Message-Id: <201603311213.u2VCD2hq073315@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: fanf set sender to
 fanf@FreeBSD.org using -f
From: Tony Finch <fanf@FreeBSD.org>
Date: Thu, 31 Mar 2016 12:13:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297449 - head/usr.bin/whois
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Mar 2016 12:13:03 -0000

Author: fanf
Date: Thu Mar 31 12:13:01 2016
New Revision: 297449
URL: https://svnweb.freebsd.org/changeset/base/297449

Log:
  Fix whois queries for ARIN AS numbers.
  
  The ARIN whois server likes AS number queries to be in the form
  "a 8075" rather than "as7085".

Modified:
  head/usr.bin/whois/whois.c

Modified: head/usr.bin/whois/whois.c
==============================================================================
--- head/usr.bin/whois/whois.c	Thu Mar 31 12:10:17 2016	(r297448)
+++ head/usr.bin/whois/whois.c	Thu Mar 31 12:13:01 2016	(r297449)
@@ -431,9 +431,13 @@ done:
 	else if ((flags & WHOIS_SPAM_ME) ||
 		 strchr(query, ' ') != NULL)
 		fprintf(fp, "%s\r\n", query);
-	else if (strcasecmp(hostname, ANICHOST) == 0)
-		fprintf(fp, "+ %s\r\n", query);
-	else if (strcasecmp(hostres->ai_canonname, VNICHOST) == 0)
+	else if (strcasecmp(hostname, ANICHOST) == 0) {
+		if (strncasecmp(query, "AS", 2) == 0 &&
+		    strspn(query+2, "0123456789") == strlen(query+2))
+			fprintf(fp, "+ a %s\r\n", query+2);
+		else
+			fprintf(fp, "+ %s\r\n", query);
+	} else if (strcasecmp(hostres->ai_canonname, VNICHOST) == 0)
 		fprintf(fp, "domain %s\r\n", query);
 	else
 		fprintf(fp, "%s\r\n", query);