From owner-p4-projects@FreeBSD.ORG Thu Sep 9 03:52:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D077A10656DB; Thu, 9 Sep 2010 03:52:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 933D110656C6 for ; Thu, 9 Sep 2010 03:52:09 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 80FE28FC28 for ; Thu, 9 Sep 2010 03:52:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o893q9ik038745 for ; Thu, 9 Sep 2010 03:52:09 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o893q9bo038742 for perforce@freebsd.org; Thu, 9 Sep 2010 03:52:09 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 9 Sep 2010 03:52:09 GMT Message-Id: <201009090352.o893q9bo038742@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2010 03:52:10 -0000 http://p4web.freebsd.org/@@183538?ac=10 Change 183538 by sson@sson_amd64 on 2010/09/09 03:52:08 If the "host" parameter is included in the audit_control file then trails don't get expired. This is because the non-trail files are not properly filtered. PR: 149806 Obtained from: Janne Snabb Affected files ... .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#13 $ */ #include @@ -429,7 +429,7 @@ /* * Quickly filter non-trail files. */ - if (dp->d_namlen != (FILENAME_LEN - 1) || + if (dp->d_namlen < (FILENAME_LEN - 1) || #ifdef DT_REG dp->d_type != DT_REG || #endif