head	1.5;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.3.16.1.4.2
	RELENG_9_1:1.3.16.1.0.4
	RELENG_9_1_BP:1.3.16.1
	RELENG_8_3_0_RELEASE:1.3.10.1.8.1
	RELENG_8_3:1.3.10.1.0.8
	RELENG_8_3_BP:1.3.10.1
	RELENG_9_0_0_RELEASE:1.3.16.1.2.1
	RELENG_9_0:1.3.16.1.0.2
	RELENG_9_0_BP:1.3.16.1
	RELENG_9:1.3.0.16
	RELENG_9_BP:1.3
	RELENG_7_4_0_RELEASE:1.3.14.1
	RELENG_8_2_0_RELEASE:1.3.10.1.6.1
	RELENG_7_4:1.3.0.14
	RELENG_7_4_BP:1.3
	RELENG_8_2:1.3.10.1.0.6
	RELENG_8_2_BP:1.3.10.1
	RELENG_8_1_0_RELEASE:1.3.10.1.4.1
	RELENG_8_1:1.3.10.1.0.4
	RELENG_8_1_BP:1.3.10.1
	RELENG_7_3_0_RELEASE:1.3.12.1
	RELENG_7_3:1.3.0.12
	RELENG_7_3_BP:1.3
	RELENG_8_0_0_RELEASE:1.3.10.1.2.1
	RELENG_8_0:1.3.10.1.0.2
	RELENG_8_0_BP:1.3.10.1
	RELENG_8:1.3.0.10
	RELENG_8_BP:1.3
	RELENG_7_2_0_RELEASE:1.3.8.1
	RELENG_7_2:1.3.0.8
	RELENG_7_2_BP:1.3
	RELENG_7_1_0_RELEASE:1.3.6.1
	RELENG_6_4_0_RELEASE:1.2.2.2.6.1
	RELENG_7_1:1.3.0.6
	RELENG_7_1_BP:1.3
	RELENG_6_4:1.2.2.2.0.6
	RELENG_6_4_BP:1.2.2.2
	RELENG_7_0_0_RELEASE:1.3
	RELENG_6_3_0_RELEASE:1.2.2.2
	RELENG_7_0:1.3.0.4
	RELENG_7_0_BP:1.3
	RELENG_6_3:1.2.2.2.0.4
	RELENG_6_3_BP:1.2.2.2
	RELENG_7:1.3.0.2
	RELENG_7_BP:1.3
	RELENG_6_2_0_RELEASE:1.2.2.2
	RELENG_6_2:1.2.2.2.0.2
	RELENG_6_2_BP:1.2.2.2
	RELENG_6:1.2.0.2;
locks; strict;
comment	@# @;


1.5
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2012.01.06.14.00.31;	author pjd;	state Exp;
branches;
next	1.3;

1.3
date	2006.09.24.17.31.04;	author rwatson;	state Exp;
branches
	1.3.2.1
	1.3.6.1
	1.3.8.1
	1.3.10.1
	1.3.12.1
	1.3.14.1
	1.3.16.1;
next	1.2;

1.2
date	2006.06.06.17.22.55;	author trhodes;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2006.02.02.10.02.55;	author rwatson;	state Exp;
branches;
next	;

1.5.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.02.43;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2012.11.17.08.01.20;	author svnexp;	state Exp;
branches;
next	;

1.3.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.3.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.3.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.3.10.1.2.1
	1.3.10.1.4.1
	1.3.10.1.6.1
	1.3.10.1.8.1;
next	1.3.10.2;

1.3.10.2
date	2012.11.17.10.35.56;	author svnexp;	state Exp;
branches;
next	;

1.3.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.3.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.3.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.3.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.3.10.1.8.2;

1.3.10.1.8.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.3.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.3.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.3.14.2;

1.3.14.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.3.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.16.1.2.1
	1.3.16.1.4.1;
next	1.3.16.2;

1.3.16.2
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.3.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.16.1.2.2;

1.3.16.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.3.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.16.1.4.2;

1.3.16.1.4.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2006.09.02.13.27.08;	author rwatson;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2006.09.27.10.08.47;	author rwatson;	state Exp;
branches
	1.2.2.2.6.1;
next	1.2.2.3;

1.2.2.3
date	2012.11.17.07.39.06;	author svnexp;	state Exp;
branches;
next	;

1.2.2.2.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/auditd 229701 2012-01-06 14:00:31Z pjd $
#
# Start up for the Audit daemon.
#

# PROVIDE: auditd
# REQUIRE: syslogd
# BEFORE:  DAEMON
# KEYWORD: nojail shutdown

. /etc/rc.subr

name="auditd"
stop_cmd="auditd_stop"
command="/usr/sbin/${name}"
rcvar="auditd_enable"
command_args="${auditd_flags}"
required_files="/etc/security/audit_class /etc/security/audit_control
		/etc/security/audit_event /etc/security/audit_user
		/etc/security/audit_warn"

auditd_stop()
{

	/usr/sbin/audit -t
	sleep 1
}

load_rc_config $name
run_rc_command "$1"
@


1.5.2.1
log
@file auditd was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 32
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 32
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/auditd 180563 2008-07-16 19:22:48Z dougb $
#
# Start up for the Audit daemon.
#

# PROVIDE: auditd
# REQUIRE: syslogd
# BEFORE:  DAEMON
# KEYWORD: shutdown

. /etc/rc.subr

name="auditd"
stop_cmd="auditd_stop"
command="/usr/sbin/${name}"
rcvar="auditd_enable"
command_args="${auditd_flags}"
required_files="/etc/security/audit_class /etc/security/audit_control
		/etc/security/audit_event /etc/security/audit_user
		/etc/security/audit_warn"

auditd_stop()
{

	/usr/sbin/audit -t
	sleep 1
}

load_rc_config $name
run_rc_command "$1"
@


1.4
log
@SVN rev 229701 on 2012-01-06 14:00:31Z by pjd

Add 'nojail' keyword as auditd(8) can't really do anything useful when
inside a jail.

Discussed with:	rwatson
MFC after:	1 week
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.3
log
@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.

MFC after:	3 days
Obtained from:	TrustedBSD Project
@
text
@d11 1
a11 1
# KEYWORD: shutdown
@


1.3.2.1
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/auditd 220110 2011-03-28 19:29:30Z dougb $
@


1.3.16.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.16.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/9/etc/rc.d/auditd 180563 2008-07-16 19:22:48Z dougb $
@


1.3.16.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.3.16.1.4.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/auditd 180563 2008-07-16 19:22:48Z dougb $
@


1.3.16.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3.16.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/auditd 180563 2008-07-16 19:22:48Z dougb $
@


1.3.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.3.14.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/auditd 162605 2006-09-24 17:31:04Z rwatson $
@


1.3.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.3.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.3.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d3 1
a3 1
# $FreeBSD: stable/8/etc/rc.d/auditd 180563 2008-07-16 19:22:48Z dougb $
@


1.3.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.10.1.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/auditd 180563 2008-07-16 19:22:48Z dougb $
@


1.3.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.3.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.3.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.3.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.3.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.2
log
@Sync to p4:

o Add shutdown KEYWORD;
o Remove PID check;
o Stop auditd with '-t'
o General cleanup.
@
text
@d28 1
@


1.2.2.1
log
@Merge Makefile:1.64, auditd:1.1,1.2 from HEAD to RELENG_6:

  Add auditd rc.d script.

Obtained from:	TrustedBSD Project
@
text
@@


1.2.2.2
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)
@
text
@a27 1
	sleep 1
@


1.2.2.3
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/auditd 162697 2006-09-27 10:08:47Z rwatson $
@


1.2.2.2.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Add auditd rc.d script.

Submitted by:	trhodes
Obtained from:	TrustedBSD Project
@
text
@d11 1
d27 1
a27 5
	if [ -f /var/run/auditd.pid ]; then
		/usr/sbin/audit -t
	else
		echo "The audit daemon is not running";
	fi
@

