head	1.19;
access;
symbols
	RELENG_8_4:1.19.0.2
	RELENG_9_1_0_RELEASE:1.17.4.2.2.2
	RELENG_9_1:1.17.4.2.0.2
	RELENG_9_1_BP:1.17.4.2
	RELENG_8_3_0_RELEASE:1.17.2.2.2.1
	RELENG_8_3:1.17.2.2.0.2
	RELENG_8_3_BP:1.17.2.2
	RELENG_9_0_0_RELEASE:1.17.4.1.2.1
	RELENG_9_0:1.17.4.1.0.2
	RELENG_9_0_BP:1.17.4.1
	RELENG_9:1.17.0.4
	RELENG_9_BP:1.17
	RELENG_7_4_0_RELEASE:1.15.2.1.8.1
	RELENG_8_2_0_RELEASE:1.17.2.1.6.1
	RELENG_7_4:1.15.2.1.0.8
	RELENG_7_4_BP:1.15.2.1
	RELENG_8_2:1.17.2.1.0.6
	RELENG_8_2_BP:1.17.2.1
	RELENG_8_1_0_RELEASE:1.17.2.1.4.1
	RELENG_8_1:1.17.2.1.0.4
	RELENG_8_1_BP:1.17.2.1
	RELENG_7_3_0_RELEASE:1.15.2.1.6.1
	RELENG_7_3:1.15.2.1.0.6
	RELENG_7_3_BP:1.15.2.1
	RELENG_8_0_0_RELEASE:1.17.2.1.2.1
	RELENG_8_0:1.17.2.1.0.2
	RELENG_8_0_BP:1.17.2.1
	RELENG_8:1.17.0.2
	RELENG_8_BP:1.17
	RELENG_7_2_0_RELEASE:1.15.2.1.4.1
	RELENG_7_2:1.15.2.1.0.4
	RELENG_7_2_BP:1.15.2.1
	RELENG_7_1_0_RELEASE:1.15.2.1.2.1
	RELENG_6_4_0_RELEASE:1.14.2.1.2.1
	RELENG_7_1:1.15.2.1.0.2
	RELENG_7_1_BP:1.15.2.1
	RELENG_6_4:1.14.2.1.0.2
	RELENG_6_4_BP:1.14.2.1
	RELENG_7_0_0_RELEASE:1.15.4.1
	RELENG_6_3_0_RELEASE:1.14
	RELENG_7_0:1.15.0.4
	RELENG_7_0_BP:1.15
	RELENG_6_3:1.14.0.10
	RELENG_6_3_BP:1.14
	RELENG_7:1.15.0.2
	RELENG_7_BP:1.15
	RELENG_6_2_0_RELEASE:1.14
	RELENG_6_2:1.14.0.8
	RELENG_6_2_BP:1.14
	RELENG_5_5_0_RELEASE:1.13.2.1
	RELENG_5_5:1.13.2.1.0.6
	RELENG_5_5_BP:1.13.2.1
	RELENG_6_1_0_RELEASE:1.14
	RELENG_6_1:1.14.0.6
	RELENG_6_1_BP:1.14
	RELENG_6_0_0_RELEASE:1.14
	RELENG_6_0:1.14.0.4
	RELENG_6_0_BP:1.14
	RELENG_6:1.14.0.2
	RELENG_6_BP:1.14
	RELENG_5_4_0_RELEASE:1.13.2.1
	RELENG_5_4:1.13.2.1.0.4
	RELENG_5_4_BP:1.13.2.1
	RELENG_5_3_0_RELEASE:1.13.2.1
	RELENG_5_3:1.13.2.1.0.2
	RELENG_5_3_BP:1.13.2.1
	RELENG_5:1.13.0.2
	RELENG_5_BP:1.13
	RELENG_5_2_1_RELEASE:1.10
	RELENG_5_2_0_RELEASE:1.10
	RELENG_5_2:1.10.0.2
	RELENG_5_2_BP:1.10
	RELENG_5_1_0_RELEASE:1.8
	RELENG_5_1:1.8.0.2
	RELENG_5_1_BP:1.8
	RELENG_5_0_0_RELEASE:1.5
	RELENG_5_0:1.5.0.2
	RELENG_5_0_BP:1.5
	head_20020621:1.1.1.2
	head_20010615:1.1.1.1
	NETBSD:1.1.1;
locks; strict;
comment	@# @;


1.19
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2012.01.14.02.18.41;	author dougb;	state Exp;
branches;
next	1.17;

1.17
date	2009.06.01.05.35.03;	author dougb;	state Exp;
branches
	1.17.2.1
	1.17.4.1;
next	1.16;

1.16
date	2007.12.08.07.20.22;	author dougb;	state Exp;
branches;
next	1.15;

1.15
date	2006.12.31.10.37.18;	author yar;	state Exp;
branches
	1.15.2.1
	1.15.4.1;
next	1.14;

1.14
date	2004.10.07.13.55.26;	author mtm;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	2004.03.08.12.25.05;	author pjd;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2004.01.17.10.40.45;	author mtm;	state Exp;
branches;
next	1.11;

1.11
date	2004.01.17.10.16.38;	author mtm;	state Exp;
branches;
next	1.10;

1.10
date	2003.11.03.17.03.01;	author mux;	state Exp;
branches;
next	1.9;

1.9
date	2003.10.13.08.20.55;	author dougb;	state Exp;
branches;
next	1.8;

1.8
date	2003.04.30.02.54.17;	author mtm;	state Exp;
branches;
next	1.7;

1.7
date	2003.04.24.18.14.52;	author mtm;	state Exp;
branches;
next	1.6;

1.6
date	2003.04.24.08.20.47;	author mtm;	state Exp;
branches;
next	1.5;

1.5
date	2002.10.26.00.18.06;	author fenner;	state Exp;
branches;
next	1.4;

1.4
date	2002.10.12.10.31.31;	author schweikh;	state Exp;
branches;
next	1.3;

1.3
date	2002.09.06.16.18.05;	author gordon;	state Exp;
branches;
next	1.2;

1.2
date	2002.06.13.22.14.36;	author gordon;	state Exp;
branches;
next	1.1;

1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches
	1.1.1.1;
next	;

1.19.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.19.2.2;

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

1.17.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.17.2.1.2.1
	1.17.2.1.4.1
	1.17.2.1.6.1;
next	1.17.2.2;

1.17.2.2
date	2012.02.14.10.17.14;	author dougb;	state Exp;
branches
	1.17.2.2.2.1;
next	1.17.2.3;

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

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

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

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

1.17.2.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.17.2.2.2.2;

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

1.17.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.17.4.1.2.1;
next	1.17.4.2;

1.17.4.2
date	2012.02.14.10.16.56;	author dougb;	state Exp;
branches
	1.17.4.2.2.1;
next	1.17.4.3;

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

1.17.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.17.4.1.2.2;

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

1.17.4.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.17.4.2.2.2;

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

1.15.2.1
date	2008.01.28.07.55.44;	author dougb;	state Exp;
branches
	1.15.2.1.2.1
	1.15.2.1.4.1
	1.15.2.1.6.1
	1.15.2.1.8.1;
next	1.15.2.2;

1.15.2.2
date	2012.02.14.10.17.30;	author dougb;	state Exp;
branches;
next	1.15.2.3;

1.15.2.3
date	2012.11.17.08.01.21;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.15.2.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.15.2.1.8.2;

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

1.15.4.1
date	2008.01.28.07.58.31;	author dougb;	state Exp;
branches;
next	;

1.14.2.1
date	2008.01.28.08.22.32;	author dougb;	state Exp;
branches
	1.14.2.1.2.1;
next	1.14.2.2;

1.14.2.2
date	2012.11.17.07.39.07;	author svnexp;	state Exp;
branches;
next	;

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

1.13.2.1
date	2004.10.10.09.50.53;	author mtm;	state Exp;
branches;
next	;

1.1.1.1
date	2001.06.16.07.16.14;	author obrien;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2002.06.21.19.07.21;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.19
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# $FreeBSD: head/etc/rc.d/ipnat 230099 2012-01-14 02:18:41Z dougb $
#

# PROVIDE: ipnat
# REQUIRE: ipfilter
# KEYWORD: nojail

. /etc/rc.subr

name="ipnat"
rcvar="ipnat_enable"
load_rc_config $name
start_cmd="ipnat_start"
stop_cmd="${ipnat_program} -F -C"
reload_cmd="${ipnat_program} -F -C -f ${ipnat_rules}"
extra_commands="reload"
required_files="${ipnat_rules}"
required_modules="ipl:ipfilter"

ipnat_start()
{
	echo "Installing NAT rules."
	${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}
}

run_rc_command "$1"
@


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


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

# PROVIDE: ipnat
# REQUIRE: ipfilter
# KEYWORD: nojail

. /etc/rc.subr

name="ipnat"
rcvar="ipnat_enable"
load_rc_config $name
start_cmd="ipnat_start"
stop_cmd="${ipnat_program} -F -C"
reload_cmd="${ipnat_program} -F -C -f ${ipnat_rules}"
extra_commands="reload"
required_files="${ipnat_rules}"
required_modules="ipl:ipfilter"

ipnat_start()
{
	echo "Installing NAT rules."
	${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags}
}

run_rc_command "$1"
@


1.18
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
@d3 1
a3 1
# $FreeBSD$
@


1.17
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
@d13 1
a13 1
rcvar=`set_rcvar`
@


1.17.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.17.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="ipnat_enable"
@


1.17.4.3
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/ipnat 231653 2012-02-14 10:16:56Z dougb $
@


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


1.17.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.17.4.1.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/9.0/etc/rc.d/ipnat 193198 2009-06-01 05:35:03Z dougb $
@


1.17.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.17.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="ipnat_enable"
@


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


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


1.17.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.17.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.17.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.16
log
@Remove $NetBSD$ CVS tags. We no longer attempt to synch our rc.d files
with theirs, so this information doesn't need to be in the live file.
Having it in our CVS history is enough.
@
text
@a7 1
# BEFORE:  DAEMON netif
@


1.15
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
@a2 1
# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
@


1.15.4.1
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.

Approved by:	re (kensmith)
@
text
@d3 1
@


1.15.2.1
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.
@
text
@d3 1
@


1.15.2.2
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
@d14 1
a14 1
rcvar="ipnat_enable"
@


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


1.15.2.1.8.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.15.2.1.8.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: releng/7.4/etc/rc.d/ipnat 175736 2008-01-28 07:55:44Z dougb $
@


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

Discussed with: dougb, brooks
MFC after: 3 days
@
text
@a16 1
start_precmd="ipnat_precmd"
d21 2
a22 13

ipnat_precmd()
{
	# Make sure ipfilter is loaded before continuing
	if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then
		if kldload ipl; then
			info 'IP-filter module loaded.'
		else
			err 1 'IP-filter module failed to load.'
		fi
	fi
	return 0
}
a25 4
	if [ ! -f ${ipnat_rules} ]; then
		warn 'NO IPNAT RULES'
		return 0
	fi
@


1.14.2.1
log
@MFC the purely cosmetic changes, including removal of $NetBSD$ Ids,
a few spurious #'s, an empty REQUIRE, and a never-used KEYWORD.
@
text
@d3 1
@


1.14.2.2
log
@Switch importer
@
text
@d3 1
a3 1
# $FreeBSD: stable/6/etc/rc.d/ipnat 175742 2008-01-28 08:22:33Z dougb $
@


1.14.2.1.2.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.13
log
@Mark scripts as not usable inside a jail by adding keyword 'nojail'.

Some suggestions from:	rwatson, Ruben de Groot <mail25@@bzerk.org>
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD nojail
@


1.13.2.1
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
@d10 1
a10 1
# KEYWORD: nojail
@


1.12
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, remove
NetBSD specific stuff (which made our scripts more complicated
than necessary).

The NetBSD ident string will be left intact, both for history and
also incase we wish to pull in future versions.
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD
@


1.11
log
@Luke Mewburn has indicated that they (NetBSD) are not interested
in keeping the scripts under rc.d in sync with us. So, begin removal
of NetBSD specific stuff (which made our scripts more complicated
than necessary), starting with the NetBSD KEYWORD.
@
text
@a16 9

case ${OSTYPE} in
NetBSD)
	ipnat_flags=
	ipnat_rules="/etc/ipnat.conf"
	ipnat_program="/usr/sbin/ipnat"
	;;
esac

a24 10
	case ${OSTYPE} in
	NetBSD)
		if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then
			echo "Enabling ipfilter for NAT."
			/sbin/ipf -E -Fa
		fi
		return 0
		;;
	esac

@


1.10
log
@Change a bogus -n parameter to echo(1).
@
text
@d10 1
a10 1
# KEYWORD: FreeBSD NetBSD
@


1.9
log
@Remove trailing whitespace
@
text
@d61 1
a61 1
	echo -n "Installing NAT rules."
@


1.8
log
@o Make the 'Ip-filter module loaded' messages informational
o Make 'No ipnat rules' a warning
o Remove unecessary ' ..'

Approved by:	markm (implicit)
@
text
@d36 1
a36 1
		if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then	
@


1.7
log
@Use $ipnat_program instead of the hardcoded path, which was wron
anyways.

Approved by:	markm (mentor) (implicit)
Submitted by:	leafy <leafy@@leafy.idv.tw>
@
text
@d47 1
a47 1
			echo 'IP-filter module loaded.'
d58 1
a58 1
		echo -n ' NO IPNAT RULES'
d61 1
a61 1
	echo -n "Installing NAT rules ... "
@


1.6
log
@Make ipfilter, ipnat, ipmon, and ipfs behave more like the old rc.
	o group them together so they run one right after another
	o use the NetBSD supplied ipfs script instead of tacking
	  it on to the end of ipnat
	o Load the ipl module in ipnat and ipfilter, if it's not already
	  loaded
	o In ipmon and ipnat show a warning if neither ipfilter nor
	  ipnat is enabled or the ipl module is not loaded, and exit

Approved by:	markm (mentor) (implicit)
Tested by:	leafy <leafy@@leafy.idv.tw>
@
text
@d62 1
a62 1
	/usr/sbin/ipnat -CF -f ${ipnat_rules} ${ipnat_flags}
@


1.5
log
@Fix "err" usage.

PR:		44284
Submitted by:	Sergey Mokryshev <mokr@@mokr.net>
@
text
@d8 2
a9 2
# REQUIRE: ipfilter mountcritremote
# BEFORE:  DAEMON
d16 1
a18 5
FreeBSD)
	IPNATDIR="/sbin"
	start_precmd="ipnat_precmd"
	reload_cmd="ipnat_start"
	;;
d20 3
a22 4
	IPNATDIR="/usr/sbin"
	config="/etc/ipnat.conf"
	reload_cmd="/usr/sbin/ipnat -F -C -f ${config}"
	start_precmd=
d26 1
d28 2
a29 1
stop_cmd="${ipnat_program:-${IPNATDIR}/${name}} -F -C"
d34 10
d46 5
a50 1
		err 1 'ipnat requires ipfilter be loaded'
d57 6
a62 35
	case ${OSTYPE} in
	FreeBSD)
		echo -n 'Installing NAT rules ... '
		if [ -r "${ipnat_rules}" ]; then
			${ipnat_program:-/sbin/ipnat} -CF -f \
			    "${ipnat_rules}" ${ipnat_flags}
		else
			echo -n ' NO IPNAT RULES'
		fi
		echo '.'

		# restore filter/NAT state tables after loading the rules
		if checkyesno ipfs_enable; then
			if [ -r "/var/db/ipf/ipstate.ipf" ]; then
				echo -n ' ipfs'
				${ipfs_program:-/sbin/ipfs} -R ${ipfs_flags}
				# remove files to avoid reloading old state
				# after an ungraceful shutdown
				rm -f /var/db/ipf/ipstate.ipf
				rm -f /var/db/ipf/ipnat.ipf
			fi
		fi
		;;
	NetBSD)
		if [ ! -f ${config} ]; then
			return 0
		fi
		if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then
			echo "Enabling ipfilter for NAT."
			/sbin/ipf -E -Fa
		fi
		echo -n "Installing NAT rules ... "
		/usr/sbin/ipnat -F -f ${config}
		;;
	esac
a64 1
load_rc_config $name
@


1.4
log
@Fix style bugs:
* Space -> tabs conversion.
* Removed blanks before semicolon in "if ... ; then".
* Proper indentation of misindented lines.
* Put a full stop after some comments.
* Removed whitespace at end of line.

Approved by:	silence from gordon
@
text
@d39 1
a39 2
		err 'ipnat requires ipfilter be loaded'
		return 1
@


1.3
log
@Convert from `${CMD_OSTYPE}` to ${OSTYPE}. This saves a shell invocation on
OS-dependent case switches.
@
text
@d38 1
a38 1
	if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1 ; then
d59 1
a59 1
		if checkyesno ipfs_enable ; then
@


1.2
log
@Merge in all the changes that Mike Makonnen has been maintaining for a
while. This is only the script pieces, the glue for the build comes next.

Submitted by:	Mike Makonnen <makonnen@@pacbell.net>
Reviewed by:	silence on -current and -hackers
Prodded by:	rwatson
@
text
@d17 1
a17 1
case `${CMD_OSTYPE}` in
d47 1
a47 1
	case `${CMD_OSTYPE}` in
@


1.1
log
@Initial revision
@
text
@d3 2
a4 1
# $NetBSD: ipnat,v 1.5 2000/08/21 23:33:50 lukem Exp $
d9 2
d15 16
a30 2
rcvar=$name
config="/etc/ipnat.conf"
d32 1
a32 2
stop_cmd="/usr/sbin/ipnat -F -C"
reload_cmd="/usr/sbin/ipnat -F -C -f ${config}"
d35 10
d47 35
a81 9
	if [ ! -f ${config} ]; then
		return 0
	fi
	if ! checkyesno ipfilter || [ ! -f /etc/ipf.conf ]; then
		echo "Enabling ipfilter for NAT."
		/sbin/ipf -E -Fa
	fi
	echo -n "Installing NAT rules ... "
	/usr/sbin/ipnat -F -f ${config}
@


1.1.1.1
log
@Import the NetBSD 1.5 RC system.

Note that `rc' and `rc.shutdown' could not be imported because we already
have files with those names.
@
text
@@


1.1.1.2
log
@Sync with NetBSD's mainline.
@
text
@d3 1
a3 1
# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $
a7 1
# BEFORE:  DAEMON
@

