From owner-svn-src-all@FreeBSD.ORG  Sun Jul  8 20:41:55 2012
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 7E3D5106566B;
	Sun,  8 Jul 2012 20:41:55 +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 685BD8FC12;
	Sun,  8 Jul 2012 20:41:55 +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 q68KftrW073533;
	Sun, 8 Jul 2012 20:41:55 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q68Kftoa073531;
	Sun, 8 Jul 2012 20:41:55 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201207082041.q68Kftoa073531@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 8 Jul 2012 20:41:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238264 - stable/9/contrib/openbsm/libauditd
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: Sun, 08 Jul 2012 20:41:55 -0000

Author: rwatson
Date: Sun Jul  8 20:41:54 2012
New Revision: 238264
URL: http://svn.freebsd.org/changeset/base/238264

Log:
  Merge r234034 from head to stable/9:
  
    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
  
  Approved by:	re (kib)

Modified:
  stable/9/contrib/openbsm/libauditd/auditd_lib.c
Directory Properties:
  stable/9/contrib/openbsm/   (props changed)

Modified: stable/9/contrib/openbsm/libauditd/auditd_lib.c
==============================================================================
--- stable/9/contrib/openbsm/libauditd/auditd_lib.c	Sun Jul  8 20:39:00 2012	(r238263)
+++ stable/9/contrib/openbsm/libauditd/auditd_lib.c	Sun Jul  8 20:41:54 2012	(r238264)
@@ -520,6 +520,7 @@ auditd_expire_trails(int (*warn_expired)
 				}
 
 		}
+		closedir(dirp);
 	}
 
 	oldest_time = current_time - expire_age;