From owner-svn-src-head@FreeBSD.ORG  Sun Apr  8 11:05:23 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA753106566B;
	Sun,  8 Apr 2012 11:05:22 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5A238FC15;
	Sun,  8 Apr 2012 11:05:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q38B5MLx009112;
	Sun, 8 Apr 2012 11:05:22 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q38B5MGf009110;
	Sun, 8 Apr 2012 11:05:22 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201204081105.q38B5MGf009110@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 8 Apr 2012 11:05:22 +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: r234034 - head/contrib/openbsm/libauditd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 08 Apr 2012 11:05:23 -0000

Author: rwatson
Date: Sun Apr  8 11:05:22 2012
New Revision: 234034
URL: http://svn.freebsd.org/changeset/base/234034

Log:
  Merge a local fix to OpenBSM's libauditd to avoid a directory descriptor
  leak when iterating over possible audit trail directories.  This fix will
  be merged upstream in an identical form, but hasn't yet appeared in an
  OpenBSM release.
  
  Submitted by:	guido
  Obtained from:	TrustedBSD Project
  MFC after:	3 days

Modified:
  head/contrib/openbsm/libauditd/auditd_lib.c

Modified: head/contrib/openbsm/libauditd/auditd_lib.c
==============================================================================
--- head/contrib/openbsm/libauditd/auditd_lib.c	Sun Apr  8 11:04:08 2012	(r234033)
+++ head/contrib/openbsm/libauditd/auditd_lib.c	Sun Apr  8 11:05:22 2012	(r234034)
@@ -520,6 +520,7 @@ auditd_expire_trails(int (*warn_expired)
 				}
 
 		}
+		closedir(dirp);
 	}
 
 	oldest_time = current_time - expire_age;