head	1.11;
access;
symbols
	RELENG_8_4:1.11.0.2
	RELENG_9_1_0_RELEASE:1.10.2.1.4.2
	RELENG_9_1:1.10.2.1.0.4
	RELENG_9_1_BP:1.10.2.1
	RELENG_8_3_0_RELEASE:1.9.30.1.8.1
	RELENG_8_3:1.9.30.1.0.8
	RELENG_8_3_BP:1.9.30.1
	RELENG_9_0_0_RELEASE:1.10.2.1.2.1
	RELENG_9_0:1.10.2.1.0.2
	RELENG_9_0_BP:1.10.2.1
	RELENG_9:1.10.0.2
	RELENG_9_BP:1.10
	RELENG_7_4_0_RELEASE:1.9.34.1
	RELENG_8_2_0_RELEASE:1.9.30.1.6.1
	RELENG_7_4:1.9.0.34
	RELENG_7_4_BP:1.9
	RELENG_8_2:1.9.30.1.0.6
	RELENG_8_2_BP:1.9.30.1
	RELENG_8_1_0_RELEASE:1.9.30.1.4.1
	RELENG_8_1:1.9.30.1.0.4
	RELENG_8_1_BP:1.9.30.1
	RELENG_7_3_0_RELEASE:1.9.32.1
	RELENG_7_3:1.9.0.32
	RELENG_7_3_BP:1.9
	RELENG_8_0_0_RELEASE:1.9.30.1.2.1
	RELENG_8_0:1.9.30.1.0.2
	RELENG_8_0_BP:1.9.30.1
	RELENG_8:1.9.0.30
	RELENG_8_BP:1.9
	RELENG_7_2_0_RELEASE:1.9.28.1
	RELENG_7_2:1.9.0.28
	RELENG_7_2_BP:1.9
	RELENG_7_1_0_RELEASE:1.9.26.1
	RELENG_6_4_0_RELEASE:1.9.24.1
	RELENG_7_1:1.9.0.26
	RELENG_7_1_BP:1.9
	RELENG_6_4:1.9.0.24
	RELENG_6_4_BP:1.9
	RELENG_7_0_0_RELEASE:1.9
	RELENG_6_3_0_RELEASE:1.9
	RELENG_7_0:1.9.0.22
	RELENG_7_0_BP:1.9
	RELENG_6_3:1.9.0.20
	RELENG_6_3_BP:1.9
	RELENG_7:1.9.0.18
	RELENG_7_BP:1.9
	RELENG_6_2_0_RELEASE:1.9
	RELENG_6_2:1.9.0.16
	RELENG_6_2_BP:1.9
	RELENG_5_5_0_RELEASE:1.9
	RELENG_5_5:1.9.0.14
	RELENG_5_5_BP:1.9
	RELENG_6_1_0_RELEASE:1.9
	RELENG_6_1:1.9.0.12
	RELENG_6_1_BP:1.9
	RELENG_6_0_0_RELEASE:1.9
	RELENG_6_0:1.9.0.10
	RELENG_6_0_BP:1.9
	RELENG_6:1.9.0.8
	RELENG_6_BP:1.9
	RELENG_5_4_0_RELEASE:1.9
	RELENG_5_4:1.9.0.6
	RELENG_5_4_BP:1.9
	RELENG_4_11_0_RELEASE:1.4.2.2
	RELENG_4_11:1.4.2.2.0.6
	RELENG_4_11_BP:1.4.2.2
	RELENG_5_3_0_RELEASE:1.9
	RELENG_5_3:1.9.0.4
	RELENG_5_3_BP:1.9
	RELENG_5:1.9.0.2
	RELENG_5_BP:1.9
	RELENG_4_10_0_RELEASE:1.4.2.2
	RELENG_4_10:1.4.2.2.0.4
	RELENG_4_10_BP:1.4.2.2
	RELENG_5_2_1_RELEASE:1.8
	RELENG_5_2_0_RELEASE:1.8
	RELENG_5_2:1.8.0.6
	RELENG_5_2_BP:1.8
	RELENG_4_9_0_RELEASE:1.4.2.2
	RELENG_4_9:1.4.2.2.0.2
	RELENG_4_9_BP:1.4.2.2
	RELENG_5_1_0_RELEASE:1.8
	RELENG_5_1:1.8.0.4
	RELENG_5_1_BP:1.8
	RELENG_4_8_0_RELEASE:1.4.2.1
	RELENG_4_8:1.4.2.1.0.10
	RELENG_4_8_BP:1.4.2.1
	RELENG_5_0_0_RELEASE:1.8
	RELENG_5_0:1.8.0.2
	RELENG_5_0_BP:1.8
	RELENG_4_7_0_RELEASE:1.4.2.1
	RELENG_4_7:1.4.2.1.0.8
	RELENG_4_7_BP:1.4.2.1
	RELENG_4_6_2_RELEASE:1.4.2.1
	RELENG_4_6_1_RELEASE:1.4.2.1
	RELENG_4_6_0_RELEASE:1.4.2.1
	RELENG_4_6:1.4.2.1.0.6
	RELENG_4_6_BP:1.4.2.1
	RELENG_4_5_0_RELEASE:1.4.2.1
	RELENG_4_5:1.4.2.1.0.4
	RELENG_4_5_BP:1.4.2.1
	RELENG_4_4_0_RELEASE:1.4.2.1
	RELENG_4_4:1.4.2.1.0.2
	RELENG_4_4_BP:1.4.2.1
	RELENG_4_3_0_RELEASE:1.4
	RELENG_4_3:1.4.0.4
	RELENG_4_3_BP:1.4
	RELENG_4_2_0_RELEASE:1.4
	RELENG_4_1_1_RELEASE:1.4
	PRE_SMPNG:1.4
	RELENG_4_1_0_RELEASE:1.4
	RELENG_3_5_0_RELEASE:1.2.2.2
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.2
	RELENG_4_BP:1.4
	RELENG_3_4_0_RELEASE:1.2.2.2
	RELENG_3_3_0_RELEASE:1.2.2.1
	RELENG_3_2_PAO:1.2.2.1.0.2
	RELENG_3_2_PAO_BP:1.2.2.1
	RELENG_3_2_0_RELEASE:1.2.2.1
	RELENG_3:1.2.0.2
	natd_1_8:1.1.1.1
	ARI:1.1.1;
locks; strict;
comment	@# @;


1.11
date	2012.11.17.01.50.24;	author svnexp;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2010.01.17.21.56.27;	author ed;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2004.02.23.20.13.55;	author johan;	state Exp;
branches
	1.9.8.1
	1.9.18.1
	1.9.24.1
	1.9.26.1
	1.9.28.1
	1.9.30.1
	1.9.32.1
	1.9.34.1;
next	1.8;

1.8
date	2002.04.12.19.11.09;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2001.12.04.02.19.53;	author obrien;	state Exp;
branches;
next	1.6;

1.6
date	2001.03.26.14.33.17;	author ru;	state Exp;
branches;
next	1.5;

1.5
date	2001.03.20.18.13.23;	author ru;	state Exp;
branches;
next	1.4;

1.4
date	99.09.13.18.16.38;	author ru;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	99.07.28.08.50.42;	author ru;	state Exp;
branches;
next	1.2;

1.2
date	99.03.07.18.23.55;	author brian;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	97.06.22.04.19.08;	author brian;	state Exp;
branches
	1.1.1.1;
next	;

1.11.2.1
date	2012.11.17.01.50.24;	author svnexp;	state dead;
branches;
next	1.11.2.2;

1.11.2.2
date	2013.03.28.13.03.35;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.10.2.1.2.1
	1.10.2.1.4.1;
next	1.10.2.2;

1.10.2.2
date	2012.11.17.11.36.32;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.10.2.1.2.2;

1.10.2.1.2.2
date	2012.11.17.08.36.31;	author svnexp;	state Exp;
branches;
next	;

1.10.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.10.2.1.4.2;

1.10.2.1.4.2
date	2012.11.17.08.47.22;	author svnexp;	state Exp;
branches;
next	;

1.9.8.1
date	2012.11.17.07.41.21;	author svnexp;	state Exp;
branches;
next	;

1.9.18.1
date	2012.11.17.08.03.39;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.9.30.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.9.30.1.2.1
	1.9.30.1.4.1
	1.9.30.1.6.1
	1.9.30.1.8.1;
next	1.9.30.2;

1.9.30.2
date	2012.11.17.10.36.16;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.9.30.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.9.30.1.8.2;

1.9.30.1.8.2
date	2012.11.17.08.24.57;	author svnexp;	state Exp;
branches;
next	;

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

1.9.34.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.9.34.2;

1.9.34.2
date	2012.11.17.08.16.55;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2001.04.25.10.58.41;	author ru;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2003.06.27.09.31.26;	author ru;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	2012.11.17.07.24.33;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	99.03.24.17.12.59;	author brian;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	99.10.28.18.55.34;	author ru;	state Exp;
branches;
next	;

1.1.1.1
date	97.06.22.04.19.08;	author brian;	state Exp;
branches;
next	;


desc
@@


1.11
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sbin/natd/Makefile 202532 2010-01-17 21:56:27Z ed $

PROG		= natd
SRCS		= natd.c icmp.c
WARNS?=	3
LDADD		= -lalias
DPADD		= ${LIBALIAS}
MAN		= natd.8

.include <bsd.prog.mk>
@


1.11.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:35 +0000
@
text
@d1 10
@


1.11.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 10
# $FreeBSD: releng/8.4/sbin/natd/Makefile 126178 2004-02-23 20:25:27Z johan $

PROG		= natd
SRCS		= natd.c icmp.c
WARNS?=	0
LDADD		= -lalias
DPADD		= ${LIBALIAS}
MAN		= natd.8

.include <bsd.prog.mk>
@


1.10
log
@SVN rev 202532 on 2010-01-17 21:56:27Z by ed

Raise WARNS for various tools where possible.

Submitted by:	Marius Nünnerich <marius@@nuenneri.ch>
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.10.2.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.10.2.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
@d1 1
a1 1
# $FreeBSD: stable/9/sbin/natd/Makefile 202532 2010-01-17 21:56:27Z ed $
@


1.10.2.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.10.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sbin/natd/Makefile 202532 2010-01-17 21:56:27Z ed $
@


1.10.2.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.10.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sbin/natd/Makefile 202532 2010-01-17 21:56:27Z ed $
@


1.9
log
@style.Makefile(5):
	Use WARNS?= instead of WARNS=.
@
text
@d5 1
a5 1
WARNS?=	0
@


1.9.18.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sbin/natd/Makefile 126178 2004-02-23 20:25:27Z johan $
@


1.9.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sbin/natd/Makefile 126178 2004-02-23 20:25:27Z johan $
@


1.9.34.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.9.34.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sbin/natd/Makefile 126178 2004-02-23 20:25:27Z johan $
@


1.9.32.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.9.30.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.9.30.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
@d1 1
a1 1
# $FreeBSD: stable/8/sbin/natd/Makefile 126178 2004-02-23 20:25:27Z johan $
@


1.9.30.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.9.30.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sbin/natd/Makefile 126178 2004-02-23 20:25:27Z johan $
@


1.9.30.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.9.30.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.9.30.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.9.28.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.9.26.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.9.24.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.8
log
@I don't know what the MAINTAINER means in src/ part of FreeBSD.

I'll still be overseeing the changes that go into natd(8) and
will maintain it the way I see it, non-preventing for the rest
of developers.

I will re-ask for the MAINTAINER bit if the ${MAINTAINER} gets
defined.
@
text
@d5 1
a5 1
WARNS=	0
@


1.7
log
@Default to WARNS=2.
Binary builds that cannot handle this must explicitly set WARNS=0.

Reviewed by:	mike
@
text
@a2 2
MAINTAINER	= ru@@FreeBSD.org
MAINTAINER     += ari@@suutari.iki.fi
@


1.6
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/natd/Makefile,v 1.5 2001/03/20 18:13:23 ru Exp $
d7 1
a7 1
CFLAGS	       += -Wall
@


1.5
log
@Set the default manual section for sbin/ to 8.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/natd/Makefile,v 1.4 1999/09/13 18:16:38 ru Exp $
d10 1
@


1.4
log
@Add Ari Suutari as a maintainer.

Approved by:	Ari Suutari <ari@@suutari.iki.fi>
@
text
@d1 1
a1 1
# $FreeBSD$
a9 1
MAN8		= natd.8
@


1.4.2.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/natd/Makefile,v 1.4 1999/09/13 18:16:38 ru Exp $
d10 1
a10 1
MAN		= natd.8
@


1.4.2.2
log
@MFC: Non-functional changes for diff reduction.
@
text
@d1 1
a1 1
# $FreeBSD$
d3 2
d7 1
a7 1
WARNS=	0
@


1.4.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sbin/natd/Makefile 116913 2003-06-27 09:31:27Z ru $
@


1.3
log
@Become a maintainer.

Approved by:	brian
@
text
@d1 2
d4 1
@


1.2
log
@Upgrade (almost) to natd 2.0b1

  - Transparent proxy support.
  - PERMANENT_LINK IS NOW OBSOLETE, use redirect_port instead.
  - Drop support for early FreeBSD 2.2 versions
  - If separate input & output sockets are being used
    use them to find out packet direction instead of
    normal mechanism. This can be handy in complex environments
    with multiple interfaces.
  - PPTP redirect support by Dru Nelson <dnelson@@redwoodsoft.com> added.
  - Logging enhancements from Martin Machacek <mm@@i.cz> added.

Obtained from: Ari Suutari <ari@@suutari.iki.fi>
@
text
@d1 1
@


1.2.2.1
log
@MFC: Bring natd to life in sbin
@
text
@@


1.2.2.2
log
@MFC:
- add maintainership
- allow signals to interrupt system calls        (PR bin/6676)
- configuration file parser improvements
- ioctl -> sysctl for interface address changes  (PR bin/14169)
- update description of how packets re-enter
  IP firewall filter
- remove reference to obsoleted permanent_link
@
text
@a0 4
# $FreeBSD$

MAINTAINER	= ru@@FreeBSD.org
MAINTAINER     += ari@@suutari.iki.fi
@


1.1
log
@Initial revision
@
text
@d1 6
a6 8
#	$Id:$

PROG=	natd
SRCS=	natd.c icmp.c
CFLAGS+=-Wall
LDADD=	-lalias
DPADD=	${LIBALIAS}
MAN8=	natd.8
@


1.1.1.1
log
@Bring natd into main source tree now that the
pppd/natd combination works ok.

Submitted by:	Ari Suutari <ari.suutari@@ps.carel.fi>
@
text
@@
