whois: check WHOIS_SERVER as well as RA_SERVER environment variables

WHOIS_SERVER is used by Debian's whois client.

2 files changed, 13 insertions, 3 deletions

diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 9ffa800..54c71fc 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -75,8 +75,10 @@ If the query is not a domain name or IP address,
 .Nm
 will fall back to
 the host specified in the
+.Ev WHOIS_SERVER
+or
 .Ev RA_SERVER
-environment variable, or if that is not set, it will use
+environment variables, or if those are not set, it will use
 .Pa whois.crsnic.net .
 .Pp
 The options are as follows:
@@ -176,8 +178,15 @@ are treated independently and may be used
 as queries on different whois servers.
 .Sh ENVIRONMENT
 .Bl -tag
+.It Ev WHOIS_SERVER
+The primary default whois server.
+If this is unset,
+.Nm
+uses the
+.Ev RA_SERVER
+environment variable.
 .It Ev RA_SERVER
-The default whois server.
+The secondary default whois server.
 If this is unset,
 .Nm
 will use
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 3ee2c74..9fe979c 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -183,7 +183,8 @@ main(int argc, char *argv[])
 	 * level domain from the query, or fall back to NICHOST.
 	 */
 	if (host == NULL && country == NULL) {
-		if ((host = getenv("RA_SERVER")) == NULL) {
+		if ((host = getenv("WHOIS_SERVER")) == NULL &&
+		    (host = getenv("RA_SERVER")) == NULL) {
 			use_qnichost = 1;
 			host = NICHOST;
 			if (!(flags & WHOIS_QUICK))