===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/whois/whois.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- src/usr.bin/whois/whois.c	2003/09/18 22:16:15	1.28
+++ src/usr.bin/whois/whois.c	2003/10/04 03:18:38	1.29
@@ -1,4 +1,4 @@
-/*	$OpenBSD: whois.c,v 1.28 2003/09/18 22:16:15 fgsch Exp $	*/
+/*	$OpenBSD: whois.c,v 1.29 2003/10/04 03:18:38 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
 #if 0
 static const char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: whois.c,v 1.28 2003/09/18 22:16:15 fgsch Exp $";
+static const char rcsid[] = "$OpenBSD: whois.c,v 1.29 2003/10/04 03:18:38 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -176,7 +176,10 @@
 	hints.ai_socktype = SOCK_STREAM;
 	error = getaddrinfo(server, port, &hints, &res);
 	if (error) {
-		warnx("%s: %s", server, gai_strerror(error));
+		if (error == EAI_SERVICE)
+			warnx("%s: bad port", port);
+		else
+			warnx("%s: %s", server, gai_strerror(error));
 		return (1);
 	}