From owner-cvs-src@FreeBSD.ORG Wed Sep 27 10:08:47 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDD1416A492; Wed, 27 Sep 2006 10:08:47 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40BAE43D58; Wed, 27 Sep 2006 10:08:47 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8RA8lRj069039; Wed, 27 Sep 2006 10:08:47 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8RA8lfZ069038; Wed, 27 Sep 2006 10:08:47 GMT (envelope-from rwatson) Message-Id: <200609271008.k8RA8lfZ069038@repoman.freebsd.org> From: Robert Watson Date: Wed, 27 Sep 2006 10:08:47 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/etc/rc.d auditd X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Sep 2006 10:08:47 -0000 rwatson 2006-09-27 10:08:47 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) etc/rc.d auditd Log: Merge auditd:1.3 from HEAD to RELENG_6: Sleep for one second after calling audit -t to give the audit daemon a chance to actually terminate the audit service and exit. Otherwise, on an rc.d/auditd restart, the new audit daemon instance may try to start auditing while the previous session is still running. Likewise, this ensures a chance for auditd to terminate the audit trail at system shutdown. Perhaps more ideally, the script would wait synchronously for auditd to exit rather than for an arbitrary but short period of time. Obtained from: TrustedBSD Project Approved by: re (mux) Revision Changes Path 1.2.2.2 +1 -0 src/etc/rc.d/auditd