From owner-svn-src-all@FreeBSD.ORG Sun Jul 22 12:09:43 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 98CBF106564A; Sun, 22 Jul 2012 12:09:43 +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 822BA8FC14; Sun, 22 Jul 2012 12:09:43 +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 q6MC9hPf082115; Sun, 22 Jul 2012 12:09:43 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MC9hvI082113; Sun, 22 Jul 2012 12:09:43 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201207221209.q6MC9hvI082113@svn.freebsd.org> From: Robert Watson Date: Sun, 22 Jul 2012 12:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238686 - stable/8/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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2012 12:09:43 -0000 Author: rwatson Date: Sun Jul 22 12:09:42 2012 New Revision: 238686 URL: http://svn.freebsd.org/changeset/base/238686 Log: Merge r234034 from head to stable/8: 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 Modified: stable/8/contrib/openbsm/libauditd/auditd_lib.c Modified: stable/8/contrib/openbsm/libauditd/auditd_lib.c ============================================================================== --- stable/8/contrib/openbsm/libauditd/auditd_lib.c Sun Jul 22 11:22:04 2012 (r238685) +++ stable/8/contrib/openbsm/libauditd/auditd_lib.c Sun Jul 22 12:09:42 2012 (r238686) @@ -520,6 +520,7 @@ auditd_expire_trails(int (*warn_expired) } } + closedir(dirp); } oldest_time = current_time - expire_age;