From owner-svn-src-stable@FreeBSD.ORG  Tue Sep 23 21:56:16 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 16F38CED;
 Tue, 23 Sep 2014 21:56:16 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 017DDEA0;
 Tue, 23 Sep 2014 21:56:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NLuFWf038802;
 Tue, 23 Sep 2014 21:56:15 GMT (envelope-from pjd@FreeBSD.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NLuFvc038801;
 Tue, 23 Sep 2014 21:56:15 GMT (envelope-from pjd@FreeBSD.org)
Message-Id: <201409232156.s8NLuFvc038801@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pjd set sender to pjd@FreeBSD.org
 using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Tue, 23 Sep 2014 21:56:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r272042 - stable/9/contrib/openbsm/bin/auditdistd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Sep 2014 21:56:16 -0000

Author: pjd
Date: Tue Sep 23 21:56:15 2014
New Revision: 272042
URL: http://svnweb.freebsd.org/changeset/base/272042

Log:
  MFC r271577:
  
  Fix descriptors leak.
  
  PR:		bin/191002
  Reported by:	Ryan Steinmetz
  Submitted by:	mjg

Modified:
  stable/9/contrib/openbsm/bin/auditdistd/subr.c
Directory Properties:
  stable/9/contrib/openbsm/   (props changed)

Modified: stable/9/contrib/openbsm/bin/auditdistd/subr.c
==============================================================================
--- stable/9/contrib/openbsm/bin/auditdistd/subr.c	Tue Sep 23 21:38:05 2014	(r272041)
+++ stable/9/contrib/openbsm/bin/auditdistd/subr.c	Tue Sep 23 21:56:15 2014	(r272042)
@@ -228,6 +228,11 @@ wait_for_file_init(int fd)
 	PJDLOG_ASSERT(fd != -1);
 
 #ifdef HAVE_KQUEUE
+	if (wait_for_file_kq != -1) {
+		close(wait_for_file_kq);
+		wait_for_file_kq = -1;
+	}
+
 	kq = kqueue();
 	if (kq == -1) {
 		pjdlog_errno(LOG_WARNING, "kqueue() failed");