From owner-svn-src-all@FreeBSD.ORG  Mon Oct 26 23:24:59 2009
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 C9CB8106566B;
	Mon, 26 Oct 2009 23:24:59 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B8EB98FC18;
	Mon, 26 Oct 2009 23:24:59 +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 n9QNOxkK013445;
	Mon, 26 Oct 2009 23:24:59 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9QNOxFM013443;
	Mon, 26 Oct 2009 23:24:59 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200910262324.n9QNOxFM013443@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 26 Oct 2009 23:24:59 +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: r198503 - 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: Mon, 26 Oct 2009 23:24:59 -0000

Author: cperciva
Date: Mon Oct 26 23:24:59 2009
New Revision: 198503
URL: http://svn.freebsd.org/changeset/base/198503

Log:
  Don't leak a file descriptor when ejecting a CDROM.
  
  Submitted by:	Ronald Klop, trhodes
  Note to self:	don't do commits while half-asleep

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

Modified: head/usr.sbin/sysinstall/cdrom.c
==============================================================================
--- head/usr.sbin/sysinstall/cdrom.c	Mon Oct 26 22:00:26 2009	(r198502)
+++ head/usr.sbin/sysinstall/cdrom.c	Mon Oct 26 23:24:59 2009	(r198503)
@@ -239,5 +239,6 @@ mediaEjectCDROM(Device *dev)
 	else {
 		ioctl(fd, CDIOCALLOW);
 		ioctl(fd, CDIOCEJECT);
+		close(fd);
 	}
 }