Imported Debian version 4.7.16v4.7.16

1 files changed, 4 insertions, 1 deletions

diff --git a/whois.c b/whois.c
index 3d52e72..159a665 100644
--- a/whois.c
+++ b/whois.c
@@ -432,7 +432,7 @@ const char *whereas(const unsigned short asn)
 
 char *queryformat(const char *server, const char *flags, const char *query)
 {
-    char *buf;
+    char *buf, *p;
     int i, isripe = 0;
 
     /* 64 bytes reserved for server-specific flags added later */
@@ -480,6 +480,9 @@ char *queryformat(const char *server, const char *flags, const char *query)
 	    sprintf(buf, "%s/e", query);	/* ask for english text */
 	else
 	    strcat(buf, query);
+    } else if (!isripe && strcmp(server, "whois.arin.net") == 0 &&
+	    (p = strrchr(query, '/'))) {
+	strncat(buf, query, p - query);		/* strip CIDR */
     } else
 	strcat(buf, query);
     return buf;