Date: Mon, 13 Aug 2001 11:58:40 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Brian Somers <brian@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/ppp Makefile ppp.8.m4 ppp.8 Message-ID: <20010813115840.K22318@sunbay.com> In-Reply-To: <200108111827.f7BIRE949323@freefall.freebsd.org>; from brian@FreeBSD.org on Sat, Aug 11, 2001 at 11:27:14AM -0700 References: <200108111827.f7BIRE949323@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Aug 11, 2001 at 11:27:14AM -0700, Brian Somers wrote: > brian 2001/08/11 11:27:14 PDT > > Modified files: > usr.sbin/ppp Makefile ppp.8.m4 > Removed files: > usr.sbin/ppp ppp.8 > Log: > Preprocess ppp.8.m4 into ppp.8, taking into account any compile time > options used to build ppp. > > Currently, this is a no-op and only handles LOCALNAT and LOCALRAD cases. > > This will be used for the upcoming ipv6 changes, and allows a shared > man page between OpenBSD and FreeBSD. > > Revision Changes Path > 1.90 +7 -1 src/usr.sbin/ppp/Makefile > 1.277 +41 -26 src/usr.sbin/ppp/ppp.8.m4 > This could also have been done with groff(1), which is more readable. Cheers, -- Ruslan Ermilov Oracle Developer/DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: Makefile =================================================================== RCS file: /home/ncvs/src/usr.sbin/ppp/Makefile,v retrieving revision 1.89 diff -u -p -r1.89 Makefile --- Makefile 2001/07/28 11:58:41 1.89 +++ Makefile 2001/08/13 08:57:56 @@ -19,6 +19,8 @@ BINGRP= network LDADD= -lcrypt -lmd -lutil -lz DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ} +MANFILTER= sed -e 's;%localnat%;0;' -e 's;%localrad%;0;' + .if defined(RELEASE_CRUNCH) CFLAGS+=-DRELEASE_CRUNCH .endif Index: ppp.8 =================================================================== RCS file: /home/ncvs/src/usr.sbin/ppp/Attic/ppp.8,v retrieving revision 1.276 diff -u -p -r1.276 ppp.8 --- ppp.8 2001/08/07 15:48:49 1.276 +++ ppp.8 2001/08/13 08:58:00 @@ -1,3 +1,5 @@ +.nr LOCALNAT %localnat% +.nr LOCALRAD %localrad% .\" .\" Copyright (c) 2001 Brian Somers <brian@Awfulhak.org> .\" All rights reserved. @@ -63,9 +65,11 @@ This allows .Nm to act as a NAT or masquerading engine for all machines on an internal LAN. +.if !\n[LOCALNAT] \{\ Refer to .Xr libalias 3 for details. +.\} .Pp The .Fl quiet @@ -287,13 +291,15 @@ An extension to PAP and CHAP, allows authentication information to be stored in a central or distributed database along with various per-user framed connection characteristics. +.if !\n[LOCALRAD] \{\ If -.Pa libradius +.Xr libradius 3 is available at compile time, .Nm will use it to make .Em RADIUS requests when configured to do so. +.\} .It Supports Proxy Arp. .Nm can be configured to make one or more proxy arp entries on behalf of @@ -2189,7 +2195,7 @@ specify third and forth arguments of This will force your ISP to assign a number. (The third argument will be ignored as it is less restrictive than the default mask for your -.Sq src_addr . +.Sq src_addr ) . .El .Pp An example for a connection where you don't know your IP number or your @@ -3119,9 +3125,15 @@ The option can only be enabled if networ .Pp With this option enabled, .Nm -will pass traffic for old interface addresses through the NAT engine +will pass traffic for old interface addresses through the NAT +.ie \n[LOCALNAT] \{\ +engine, +.\} +.el \{\ +engine (see .Xr libalias 3 ) , +.\} resulting in the ability (in .Fl auto mode) to properly connect the process that caused the PPP link to @@ -3310,6 +3322,7 @@ you wish to map to specific machines beh .It nat deny_incoming yes|no If set to yes, this command will refuse all incoming packets where an aliasing link doesn't already exist. +.if !\n[LOCALNAT] \{\ Refer to the .Sx CONCEPTUAL BACKGROUND section of @@ -3317,9 +3330,16 @@ section of for a description of what an .Dq aliasing link is. +.\} .Pp -It should be noted under what circumstances an aliasing link is created by +It should be noted under what circumstances an aliasing link is +.ie \n[LOCALNAT] \{\ +created. +.\} +.el \{\ +created by .Xr libalias 3 . +.\} It may be necessary to further protect your network from outside connections using the .Dq set filter @@ -3404,11 +3424,13 @@ for example: This command tells .Nm to proxy certain connections, redirecting them to a given server. +.if !\n[LOCALNAT] \{\ Refer to the description of .Fn PacketAliasProxyRule in .Xr libalias 3 for details of the available commands. +.\} .It nat punch_fw Op Ar base count This command tells .Nm @@ -3436,8 +3458,11 @@ if you want to support protocols such as connections to come from a well known port. .It nat target Op Ar address Set the given target address or clear it if no address is given. -The target address is used by libalias to specify how to NAT incoming -packets by default. +The target address is used +.if !\n[LOCALNAT] \{\ +by libalias +.\} +to specify how to NAT incoming packets by default. If a target address is not set or if .Dq default is given, packets are not altered and are allowed to route to the internal @@ -3445,7 +3470,14 @@ network. .Pp The target address may be set to .Dq MYADDR , -in which case libalias will redirect all packets to the interface address. +in which case +.ie \n[LOCALNAT] \{\ +all packets will be redirected +.\} +.el \{\ +libalias will redirect all packets +.\} +to the interface address. .It nat use_sockets yes|no When enabled, this option tells the network address translation engine to create a socket so that it can guarantee a correct incoming ftp data or @@ -5690,7 +5722,12 @@ This socket is used to pass links betwee .Xr tcpdump 1 , .Xr telnet 1 , .Xr kldload 2 , +.if !\n[LOCALNAT] \{\ .Xr libalias 3 , +.\} +.if !\n[LOCALRAD] \{\ +.Xr libradius 3 , +.\} .Xr syslog 3 , .Xr uucplock 3 , .Xr netgraph 4 , --Nq2Wo0NMKNjxTN9z-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010813115840.K22318>