From owner-svn-src-all@FreeBSD.ORG  Wed Apr 21 12:02:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F1DC106566B;
	Wed, 21 Apr 2010 12:02:46 +0000 (UTC)
	(envelope-from randi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DF0C8FC2A;
	Wed, 21 Apr 2010 12:02:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LC2kVV047113;
	Wed, 21 Apr 2010 12:02:46 GMT (envelope-from randi@svn.freebsd.org)
Received: (from randi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3LC2k7Y047111;
	Wed, 21 Apr 2010 12:02:46 GMT (envelope-from randi@svn.freebsd.org)
Message-Id: <201004211202.o3LC2k7Y047111@svn.freebsd.org>
From: Randi Harper <randi@FreeBSD.org>
Date: Wed, 21 Apr 2010 12:02:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206995 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Apr 2010 12:02:46 -0000

Author: randi
Date: Wed Apr 21 12:02:45 2010
New Revision: 206995
URL: http://svn.freebsd.org/changeset/base/206995

Log:
  Fix bug introduced in r198317: Don't leak a file descriptor after scanning for network devices.
  
  Approved by:	cperciva (mentor)
  MFC after:	1 week (original commit + bugfix)

Modified:
  head/usr.sbin/sysinstall/tcpip.c

Modified: head/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- head/usr.sbin/sysinstall/tcpip.c	Wed Apr 21 11:50:13 2010	(r206994)
+++ head/usr.sbin/sysinstall/tcpip.c	Wed Apr 21 12:02:45 2010	(r206995)
@@ -683,6 +683,8 @@ tcpDeviceScan(void)
 		}
 	}
 
+	close(s);
+
 	freeifaddrs(ifap);
 
 	return (NULL);