From owner-svn-src-head@FreeBSD.ORG  Sat Jan  4 15:51:52 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D1C0346B;
 Sat,  4 Jan 2014 15:51:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BDF191ABD;
 Sat,  4 Jan 2014 15:51:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04FpqK0080220;
 Sat, 4 Jan 2014 15:51:52 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04Fpqqq080219;
 Sat, 4 Jan 2014 15:51:52 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201401041551.s04Fpqqq080219@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Sat, 4 Jan 2014 15:51:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260259 - 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jan 2014 15:51:52 -0000

Author: kevlo
Date: Sat Jan  4 15:51:52 2014
New Revision: 260259
URL: http://svnweb.freebsd.org/changeset/base/260259

Log:
  The whois() function is called in a loop so make sure we close the
  socket to the whois server before returning.
  
  Obtained from:	OpenBSD

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

Modified: head/usr.bin/whois/whois.c
==============================================================================
--- head/usr.bin/whois/whois.c	Sat Jan  4 15:51:31 2014	(r260258)
+++ head/usr.bin/whois/whois.c	Sat Jan  4 15:51:52 2014	(r260259)
@@ -275,7 +275,7 @@ s_asprintf(char **ret, const char *forma
 static void
 whois(const char *query, const char *hostname, int flags)
 {
-	FILE *sfi, *sfo;
+	FILE *fp;
 	struct addrinfo *hostres, *res;
 	char *buf, *host, *nhost, *p;
 	int i, s;
@@ -295,20 +295,19 @@ whois(const char *query, const char *hos
 	if (res == NULL)
 		err(EX_OSERR, "connect()");
 
-	sfi = fdopen(s, "r");
-	sfo = fdopen(s, "w");
-	if (sfi == NULL || sfo == NULL)
+	fp = fdopen(s, "r+");
+	if (fp == NULL)
 		err(EX_OSERR, "fdopen()");
 	if (strcmp(hostname, GERMNICHOST) == 0) {
-		fprintf(sfo, "-T dn,ace -C US-ASCII %s\r\n", query);
+		fprintf(fp, "-T dn,ace -C US-ASCII %s\r\n", query);
 	} else if (strcmp(hostname, "dk" QNICHOST_TAIL) == 0) {
-		fprintf(sfo, "--show-handles %s\r\n", query);
+		fprintf(fp, "--show-handles %s\r\n", query);
 	} else {
-		fprintf(sfo, "%s\r\n", query);
+		fprintf(fp, "%s\r\n", query);
 	}
-	fflush(sfo);
+	fflush(fp);
 	nhost = NULL;
-	while ((buf = fgetln(sfi, &len)) != NULL) {
+	while ((buf = fgetln(fp, &len)) != NULL) {
 		while (len > 0 && isspace((unsigned char)buf[len - 1]))
 			buf[--len] = '\0';
 		printf("%.*s\n", (int)len, buf);
@@ -350,6 +349,7 @@ whois(const char *query, const char *hos
 			}
 		}
 	}
+	fclose(fp);
 	if (nhost != NULL) {
 		whois(query, nhost, 0);
 		free(nhost);