head	1.17;
access;
symbols
	RELENG_8_4:1.17.0.2
	RELENG_9_1_0_RELEASE:1.14.4.2.2.2
	RELENG_9_1:1.14.4.2.0.2
	RELENG_9_1_BP:1.14.4.2
	RELENG_8_3_0_RELEASE:1.14.2.2.2.1
	RELENG_8_3:1.14.2.2.0.2
	RELENG_8_3_BP:1.14.2.2
	RELENG_9_0_0_RELEASE:1.14.4.1.2.1
	RELENG_9_0:1.14.4.1.0.2
	RELENG_9_0_BP:1.14.4.1
	RELENG_9:1.14.0.4
	RELENG_9_BP:1.14
	RELENG_7_4_0_RELEASE:1.12.12.1
	RELENG_8_2_0_RELEASE:1.14.2.1.6.1
	RELENG_7_4:1.12.0.12
	RELENG_7_4_BP:1.12
	RELENG_8_2:1.14.2.1.0.6
	RELENG_8_2_BP:1.14.2.1
	RELENG_8_1_0_RELEASE:1.14.2.1.4.1
	RELENG_8_1:1.14.2.1.0.4
	RELENG_8_1_BP:1.14.2.1
	RELENG_7_3_0_RELEASE:1.12.10.1
	RELENG_7_3:1.12.0.10
	RELENG_7_3_BP:1.12
	RELENG_8_0_0_RELEASE:1.14.2.1.2.1
	RELENG_8_0:1.14.2.1.0.2
	RELENG_8_0_BP:1.14.2.1
	RELENG_8:1.14.0.2
	RELENG_8_BP:1.14
	RELENG_7_2_0_RELEASE:1.12.8.1
	RELENG_7_2:1.12.0.8
	RELENG_7_2_BP:1.12
	RELENG_7_1_0_RELEASE:1.12.6.1
	RELENG_6_4_0_RELEASE:1.5.2.4.4.1
	RELENG_7_1:1.12.0.6
	RELENG_7_1_BP:1.12
	RELENG_6_4:1.5.2.4.0.4
	RELENG_6_4_BP:1.5.2.4
	RELENG_7_0_0_RELEASE:1.12
	RELENG_6_3_0_RELEASE:1.5.2.4
	RELENG_7_0:1.12.0.4
	RELENG_7_0_BP:1.12
	RELENG_6_3:1.5.2.4.0.2
	RELENG_6_3_BP:1.5.2.4
	RELENG_7:1.12.0.2
	RELENG_7_BP:1.12
	RELENG_6_2_0_RELEASE:1.5.2.2
	RELENG_6_2:1.5.2.2.0.4
	RELENG_6_2_BP:1.5.2.2
	RELENG_5_5_0_RELEASE:1.1.2.3
	RELENG_5_5:1.1.2.3.0.4
	RELENG_5_5_BP:1.1.2.3
	RELENG_6_1_0_RELEASE:1.5.2.2
	RELENG_6_1:1.5.2.2.0.2
	RELENG_6_1_BP:1.5.2.2
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.4
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.2
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.1.2.3
	RELENG_5_4:1.1.2.3.0.2
	RELENG_5_4_BP:1.1.2.3
	RELENG_5_3_0_RELEASE:1.1.2.2
	RELENG_5_3:1.1.2.2.0.2
	RELENG_5_3_BP:1.1.2.2
	RELENG_5:1.1.0.2
	RELENG_5_BP:1.1;
locks; strict;
comment	@# @;


1.17
date	2012.11.17.01.49.05;	author svnexp;	state Exp;
branches
	1.17.2.1;
next	1.16;

1.16
date	2012.09.11.05.04.59;	author obrien;	state Exp;
branches;
next	1.15;

1.15
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.14;

1.14
date	2009.06.26.01.04.50;	author dougb;	state Exp;
branches
	1.14.2.1
	1.14.4.1;
next	1.13;

1.13
date	2009.06.01.05.35.03;	author dougb;	state Exp;
branches;
next	1.12;

1.12
date	2007.04.09.08.53.40;	author des;	state Exp;
branches
	1.12.2.1
	1.12.6.1
	1.12.8.1
	1.12.10.1
	1.12.12.1;
next	1.11;

1.11
date	2007.04.02.22.53.07;	author des;	state Exp;
branches;
next	1.10;

1.10
date	2006.12.31.10.37.18;	author yar;	state Exp;
branches;
next	1.9;

1.9
date	2006.12.31.10.12.53;	author yar;	state Exp;
branches;
next	1.8;

1.8
date	2006.02.05.22.38.08;	author mlaier;	state Exp;
branches;
next	1.7;

1.7
date	2005.10.02.15.54.26;	author yar;	state Exp;
branches;
next	1.6;

1.6
date	2005.09.24.15.57.17;	author pjd;	state Exp;
branches;
next	1.5;

1.5
date	2005.01.16.03.12.03;	author obrien;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches;
next	1.3;

1.3
date	2004.09.16.17.04.20;	author keramida;	state Exp;
branches;
next	1.2;

1.2
date	2004.08.31.14.23.51;	author mlaier;	state Exp;
branches;
next	1.1;

1.1
date	2004.04.02.19.25.27;	author mlaier;	state Exp;
branches
	1.1.2.1;
next	;

1.17.2.1
date	2012.11.17.01.49.05;	author svnexp;	state dead;
branches;
next	1.17.2.2;

1.17.2.2
date	2013.03.28.13.02.44;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.14.2.1.2.1
	1.14.2.1.4.1
	1.14.2.1.6.1;
next	1.14.2.2;

1.14.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.14.2.2.2.1;
next	1.14.2.3;

1.14.2.3
date	2012.11.17.10.35.57;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.14.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.14.2.2.2.2;

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

1.14.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.14.4.1.2.1;
next	1.14.4.2;

1.14.4.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.14.4.2.2.1;
next	1.14.4.3;

1.14.4.3
date	2012.10.26.18.06.49;	author obrien;	state Exp;
branches;
next	1.14.4.4;

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

1.14.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.14.4.1.2.2;

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

1.14.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.14.4.2.2.2;

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

1.12.2.1
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.12.2.2;

1.12.2.2
date	2012.11.17.08.01.22;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.12.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.12.12.2;

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

1.5.2.1
date	2006.01.22.13.40.47;	author yar;	state Exp;
branches;
next	1.5.2.2;

1.5.2.2
date	2006.03.06.16.10.17;	author mlaier;	state Exp;
branches;
next	1.5.2.3;

1.5.2.3
date	2007.03.10.14.20.34;	author yar;	state Exp;
branches;
next	1.5.2.4;

1.5.2.4
date	2007.05.24.16.14.37;	author des;	state Exp;
branches
	1.5.2.4.4.1;
next	1.5.2.5;

1.5.2.5
date	2012.11.17.07.39.08;	author svnexp;	state Exp;
branches;
next	;

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

1.1.2.1
date	2004.09.13.11.40.59;	author mlaier;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2004.10.10.09.50.54;	author mtm;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2004.12.10.19.11.26;	author rse;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/pflog 240336 2012-09-11 05:04:59Z obrien $
#

# PROVIDE: pflog
# REQUIRE: FILESYSTEMS netif FILESYSTEMS
# KEYWORD: nojail

. /etc/rc.subr

name="pflog"
rcvar="pflog_enable"
command="/sbin/pflogd"
pidfile="/var/run/pflogd.pid"
start_precmd="pflog_prestart"
stop_postcmd="pflog_poststop"
extra_commands="reload resync"

# for backward compatibility
resync_cmd="pflog_resync"

pflog_prestart()
{
	load_kld pflog || return 1

	# set pflog0 interface to up state
	if ! ifconfig pflog0 up; then
		warn 'could not bring up pflog0.'
		return 1
	fi

	# prepare the command line for pflogd
	rc_flags="-f $pflog_logfile $rc_flags"

	# report we're ready to run pflogd
	return 0
}

pflog_poststop()
{
	if ! ifconfig pflog0 down; then
		warn 'could not bring down pflog0.'
		return 1
	fi
	return 0
}

# for backward compatibility
pflog_resync()
{
	run_rc_command reload
}

load_rc_config $name
run_rc_command "$1"
@


1.17.2.1
log
@file pflog was added on branch RELENG_8_4 on 2013-03-28 13:02:44 +0000
@
text
@d1 56
@


1.17.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 56
#!/bin/sh
#
# $FreeBSD: releng/8.4/etc/rc.d/pflog 231655 2012-02-14 10:17:14Z dougb $
#

# PROVIDE: pflog
# REQUIRE: FILESYSTEMS netif cleanvar
# KEYWORD: nojail

. /etc/rc.subr

name="pflog"
rcvar="pflog_enable"
command="/sbin/pflogd"
pidfile="/var/run/pflogd.pid"
start_precmd="pflog_prestart"
stop_postcmd="pflog_poststop"
extra_commands="reload resync"

# for backward compatibility
resync_cmd="pflog_resync"

pflog_prestart()
{
	load_kld pflog || return 1

	# set pflog0 interface to up state
	if ! ifconfig pflog0 up; then
		warn 'could not bring up pflog0.'
		return 1
	fi

	# prepare the command line for pflogd
	rc_flags="-f $pflog_logfile $rc_flags"

	# report we're ready to run pflogd
	return 0
}

pflog_poststop()
{
	if ! ifconfig pflog0 down; then
		warn 'could not bring down pflog0.'
		return 1
	fi
	return 0
}

# for backward compatibility
pflog_resync()
{
	run_rc_command reload
}

load_rc_config $name
run_rc_command "$1"
@


1.16
log
@SVN rev 240336 on 2012-09-11 05:04:59Z by obrien

Simply things so that "#REQUIRE: FILESYSTEMS" means the file
systems are fully "ready to go".

'FILESYSTEMS' states: "This is a dummy dependency, for services which
require file systems to be mounted before starting."  However, we have
'var' which is was run after 'FILESYSTEMS' and can mount /var if it
already isn't mounted.  Furthermore, several scripts cannot use /var
until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
meant all critical file systems are fully usable.
@
text
@d3 1
a3 1
# $FreeBSD$
@


1.15
log
@SVN rev 230099 on 2012-01-14 02:18:41Z by dougb

Prepare for the removal of set_rcvar() by changing the rcvar=
assignments to the literal values it would have returned.

The concept of set_rcvar() was nice in theory, but the forks
it creates are a drag on the startup process, which is especially
noticeable on slower systems, such as embedded ones.

During the discussion on freebsd-rc@@ a preference was expressed for
using ${name}_enable instead of the literal values. However the
code portability concept doesn't really apply since there are so
many other places where the literal name has to be searched for
and replaced. Also, using the literal value is also a tiny bit
faster than dereferencing the variables, and every little bit helps.
@
text
@d7 1
a7 1
# REQUIRE: FILESYSTEMS netif cleanvar
@


1.14
log
@SVN rev 195026 on 2009-06-26 01:04:50Z by dougb

Reverse the effect of r193198 for pf and ipfw which will once again
allow them to start after netif. There were too many problems reported
with this change in the short period of time that it lived in HEAD, and
we are too late in the release cycle to properly shake it out.

IMO the issue of having the firewalls up before the network is still a
valid concern, particularly for pf whose default state is wide open.
However properly solving this issue is going to take some investment
on the part of the people who actually use those tools.

This is not a strict reversion of all the changes for r193198 since it
also included some simplification of the BEFORE/REQUIRE logic which is
still valid for ipfilter and ip6fw.
@
text
@d13 1
a13 1
rcvar=`set_rcvar`
@


1.14.4.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.14.4.2
log
@SVN rev 231653 on 2012-02-14 10:16:56Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="pflog_enable"
@


1.14.4.3
log
@SVN rev 242153 on 2012-10-26 18:06:49Z by obrien

MFC: r240336:
  Simply things so that "#REQUIRE: FILESYSTEMS" means the file
  systems are fully "ready to go".

  'FILESYSTEMS' states: "This is a dummy dependency, for services which
  require file systems to be mounted before starting."  However, we have
  'var' which is was run after 'FILESYSTEMS' and can mount /var if it
  already isn't mounted.  Furthermore, several scripts cannot use /var
  until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
  meant all critical file systems are fully usable.
@
text
@d7 1
a7 1
# REQUIRE: FILESYSTEMS netif FILESYSTEMS
@


1.14.4.4
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/pflog 242153 2012-10-26 18:06:49Z obrien $
@


1.14.4.2.2.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.14.4.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.1/etc/rc.d/pflog 231653 2012-02-14 10:16:56Z dougb $
@


1.14.4.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.14.4.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/pflog 195026 2009-06-26 01:04:50Z dougb $
@


1.14.2.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.14.2.2
log
@SVN rev 231655 on 2012-02-14 10:17:14Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="pflog_enable"
@


1.14.2.3
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/pflog 231655 2012-02-14 10:17:14Z dougb $
@


1.14.2.2.2.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.14.2.2.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/8.3/etc/rc.d/pflog 231655 2012-02-14 10:17:14Z dougb $
@


1.14.2.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.14.2.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.14.2.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.13
log
@SVN rev 193198 on 2009-06-01 05:35:03Z by dougb

Make the pf and ipfw firewalls start before netif, just like ipfilter
already does. This eliminates a logical inconsistency, and a small
window where the system is open after the network comes up.
@
text
@d7 1
a7 1
# REQUIRE: FILESYSTEMS cleanvar
@


1.12
log
@FILESYSTEMS requires root, so requiring both of them is redundant.
@
text
@d7 1
a7 1
# REQUIRE: FILESYSTEMS netif cleanvar
@


1.12.2.1
log
@SVN rev 231656 on 2012-02-14 10:17:30Z by dougb

MFC r230099:

Change rcvar= assignments to the literal values set_rcvar
would have returned. This will slightly reduce boot time,
and help in diff reduction to HEAD.
@
text
@d13 1
a13 1
rcvar="pflog_enable"
@


1.12.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/7/etc/rc.d/pflog 231656 2012-02-14 10:17:30Z dougb $
@


1.12.12.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.12.12.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/pflog 168531 2007-04-09 08:53:40Z des $
@


1.12.10.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.12.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.12.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.11
log
@Add a dummy script, FILESYSTEMS, which depends on root and mountcritlocal
and takes over mountcritlocal's role as the early / late divider.  This
makes it far easier to add rc scripts which need to run early, such as a
startup script for zfs, which is right around the corner.

This change should be a no-op; I have verified that the only change in
rcorder's output is the insertion of FILESYSTEMS immediately after
mountcritlocal.

MFC after:	3 weeks
@
text
@d7 1
a7 1
# REQUIRE: root FILESYSTEMS netif cleanvar
@


1.10
log
@Use $required_modules wherever suitable.  Use load_kld() in special
cases.  So we get rid of quite a few lines of duplicated code.
@
text
@d7 1
a7 1
# REQUIRE: root mountcritlocal netif cleanvar
@


1.9
log
@Fix a typo in a warning message.
@
text
@d25 1
a25 9
	# load pflog kernel module if needed
	if ! kldstat -q -m pflog; then
		if kldload pflog; then
			info 'pflog module loaded.'
		else
			warn 'pflog module failed to load.'
			return 1
		fi
	fi
@


1.8
log
@pflog is a separate module now.

Submitted by:	Antoine Brodin
PR:		kern/88271
MFC after:	1 week
@
text
@d37 1
a37 1
		warn 'could not not bring up pflog0.'
@


1.7
log
@Use rc.subr(8) appropriately:
- utilize default methods instead of rolling local ones;
- avoid to specify BEFORE conditions we don't really need
  (pflog will be REQUIRE'd by pf);
- omit extra decoration from warning messages, warn() will
  decorate them sufficiently.
@
text
@d27 2
a28 2
		if kldload pf; then
			info 'pf module loaded.'
d30 1
a30 1
			warn 'pf module failed to load.'
@


1.6
log
@Simplify the code by making use of 'kldstat -q -m <mod>'.

No objections from:	mlaier
@
text
@a7 1
# BEFORE:  DAEMON LOGIN
d14 2
a15 2
load_rc_config $name
stop_precmd="test -x ${pflog_program}"
d17 4
a20 3
start_cmd="pflog_start"
stop_cmd="pflog_stop"
resync_precmd="$stop_precmd"
a21 3
status_precmd="$stop_precmd"
status_cmd="pflog_status"
extra_commands="resync status"
d28 1
a28 1
			info 'pflog module loaded.'
d30 2
a31 1
			err 1 'pflog module failed to load.'
d37 2
a38 1
		warn 'pflog: COULD NOT SET UP pflog0'
d41 2
a42 7
	# check for pflogd binary
	if [ ! -x "${pflog_program:-/sbin/pflogd}" ]
	then
		warn 'pflog: NO PFLOGD BINARY FOUND'
		return 1
	fi
}
d44 2
a45 9
pflog_start()
{
	echo -n "Enabling pflogd"
	if ! ${pflog_program:-/sbin/pflogd} ${pflog_flags} \
	    -f ${pflog_logfile:-/var/log/pflog}; then
		echo " failed!"
	else
		echo "."
	fi
d48 1
a48 1
pflog_stop()
d50 3
a52 3
	if [ -r /var/run/pflogd.pid ]; then
		echo "Stopping pflogd."
		kill `cat /var/run/pflogd.pid`
d54 1
d57 1
d60 1
a60 12
	if [ -r /var/run/pflogd.pid ]; then
		kill -SIGHUP `cat /var/run/pflogd.pid`
	fi
}

pflog_status()
{
	if [ -r /var/run/pflogd.pid ]; then
		ps -p `cat /var/run/pflogd.pid` | tail -n 1
	else
		echo 'pflogd not running.'
	fi
d63 1
@


1.5
log
@"REQUIRE: cleanvar" for all RC's writing into /var/run.
@
text
@d29 1
a29 1
	if ! kldstat -v | grep -q pflog\$; then
@


1.5.2.1
log
@MFC rev. 1.6, 1.7:

Simplify the code by making use of 'kldstat -q -m <mod>'.

Use rc.subr(8) appropriately.
@
text
@d8 1
d15 2
a16 2
command="/sbin/pflogd"
pidfile="/var/run/pflogd.pid"
d18 3
a20 4
stop_postcmd="pflog_poststop"
extra_commands="reload resync"

# for backward compatibility
d22 3
d29 1
a29 1
	if ! kldstat -q -m pflog; then
d31 1
a31 1
			info 'pf module loaded.'
d33 1
a33 2
			warn 'pf module failed to load.'
			return 1
d39 7
a45 1
		warn 'could not not bring up pflog0.'
d48 1
d50 10
a59 2
	# prepare the command line for pflogd
	rc_flags="-f $pflog_logfile $rc_flags"
d61 6
a66 2
	# report we're ready to run pflogd
	return 0
d69 1
a69 1
pflog_poststop()
d71 2
a72 3
	if ! ifconfig pflog0 down; then
		warn 'could not bring down pflog0.'
		return 1
a73 1
	return 0
d76 1
a76 2
# for backward compatibility
pflog_resync()
d78 5
a82 1
	run_rc_command reload
a84 1
load_rc_config $name
@


1.5.2.2
log
@MFC:
  Make pflog a seperate module.  As a result pflog_packet() becomes a
  function pointer that is declared in pf_ioctl.c

  Requested by:   yar (as part of the module build reorg)

Approved by:	re (scottl)
@
text
@d27 2
a28 2
		if kldload pflog; then
			info 'pflog module loaded.'
d30 1
a30 1
			warn 'pflog module failed to load.'
@


1.5.2.3
log
@MFC rev. 1.9:

Fix a typo in a warning message.
@
text
@d37 1
a37 1
		warn 'could not bring up pflog0.'
@


1.5.2.4
log
@MFC: add FILESYSTEMS
@
text
@d7 1
a7 1
# REQUIRE: root FILESYSTEMS netif cleanvar
@


1.5.2.5
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/pflog 169945 2007-05-24 16:14:37Z des $
@


1.5.2.4.4.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.4
log
@Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@d7 1
a7 1
# REQUIRE: root mountcritlocal netif
@


1.3
log
@We don't have any providers of `beforenetlkm' in FreeBSD.  Remove the
dependency to it from our rc.d scripts.

Approved by:	mtm
@
text
@d9 1
a9 1
# KEYWORD: FreeBSD nojail
@


1.2
log
@Don't rely on properly setup linker.hints to figure out that pflog is now
part of the pf module.
While here fix a comment that was c'n'ped from rc.d/pf

PR:		bin/71096 (partly)
Submitted by:	Ville-Pertti Keinonen
MFC after:	2 days
@
text
@d7 1
a7 1
# REQUIRE: root beforenetlkm mountcritlocal netif
@


1.1
log
@Add rc.d script to start pflogd and add rcvars etc. Also document vars in
rc.conf(5) and put a sample entry to newsyslog.conf

Reviewed by:	-current
Approved by:	bms(mentor)
@
text
@d30 1
a30 1
		if kldload pflog; then
d42 1
a42 1
	# check for pf rules
@


1.1.2.1
log
@MFC pflog rev. 1.2
  Don't rely on properly setup linker.hints to figure out that pflog is now
  part of the pf module.
  While here fix a comment that was c'n'ped from rc.d/pf

  PR:             bin/71096 (partly)
  Submitted by:   Ville-Pertti Keinonen

Approved by:	re (kensmith)
@
text
@d30 1
a30 1
		if kldload pf; then
d42 1
a42 1
	# check for pflogd binary
@


1.1.2.2
log
@RCS file: /home/ncvs/src/etc/rc,v
----------------------------
revision 1.335
date: 2004/10/08 14:23:49;  author: mtm;  state: Exp;  lines: +0 -1
Remove an unused variable.

Submitted by: Pawel Worach <pawel.worach@@telia.com>
----------------------------
revision 1.334
date: 2004/10/07 13:55:25;  author: mtm;  state: Exp;  lines: +1 -1
Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/nsswitch,v
----------------------------
revision 1.4
date: 2004/09/16 17:03:12;  author: keramida;  state: Exp;  lines: +1 -1
Fix requirement of `network' to `NETWORK' because the former isn't
provided by any rc.d script.

Approved by:	mtm
=============================================================================
RCS file: /home/ncvs/src/etc/rc.d/pflog,v
----------------------------
revision 1.3
date: 2004/09/16 17:04:20;  author: keramida;  state: Exp;  lines: +1 -1
We don't have any providers of `beforenetlkm' in FreeBSD.  Remove the
dependency to it from our rc.d scripts.

Approved by:	mtm
=============================================================================

Approved by: re/scottl
@
text
@d9 1
a9 1
# KEYWORD: nojail
@


1.1.2.3
log
@MFC etc/rc.d/ike 1.3, etc/rc.d/pf 1.4, etc/rc.d/pflog 1.3:
    We don't have any providers of `beforenetlkm' in FreeBSD.
    Remove the dependency to it from our rc.d scripts.

This resolves the following rcorder(8) complains in 5.3-STABLE:

$ rcorder /etc/rc.d/* 2>&1 | grep rcorder
rcorder: requirement `beforenetlkm' in file `/etc/rc.d/ike' has no providers.
rcorder: requirement `beforenetlkm' in file `/etc/rc.d/pflog' has no providers.
rcorder: requirement `beforenetlkm' in file `/etc/rc.d/pf' has no providers.
@
text
@d7 1
a7 1
# REQUIRE: root mountcritlocal netif
@


