From owner-svn-src-head@FreeBSD.ORG Sun Jun 2 23:56:39 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C1B1D5C9; Sun, 2 Jun 2013 23:56:39 +0000 (UTC) (envelope-from brian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A2EBA1D8B; Sun, 2 Jun 2013 23:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r52NudGu007448; Sun, 2 Jun 2013 23:56:39 GMT (envelope-from brian@svn.freebsd.org) Received: (from brian@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r52Nudgd007442; Sun, 2 Jun 2013 23:56:39 GMT (envelope-from brian@svn.freebsd.org) Message-Id: <201306022356.r52Nudgd007442@svn.freebsd.org> From: Brian Somers Date: Sun, 2 Jun 2013 23:56:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251279 - head/usr.sbin/ppp X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 23:56:39 -0000 Author: brian Date: Sun Jun 2 23:56:38 2013 New Revision: 251279 URL: http://svnweb.freebsd.org/changeset/base/251279 Log: Move ppp.8.m4 back to ppp.8 and de-ifdef it. Requested by: joel MFC after: 1 week Added: head/usr.sbin/ppp/ppp.8 - copied, changed from r251278, head/usr.sbin/ppp/ppp.8.m4 Deleted: head/usr.sbin/ppp/ppp.8.m4 Modified: head/usr.sbin/ppp/Makefile Modified: head/usr.sbin/ppp/Makefile ============================================================================== --- head/usr.sbin/ppp/Makefile Sun Jun 2 23:25:27 2013 (r251278) +++ head/usr.sbin/ppp/Makefile Sun Jun 2 23:56:38 2013 (r251279) @@ -44,13 +44,6 @@ M4FLAGS= LDADD= -lcrypt -lmd -lutil -lz DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ} -.SUFFIXES: .8 .8.m4 - -.8.m4.8: - m4 ${M4FLAGS} ${.IMPSRC} >${.TARGET} - -CLEANFILES= ppp.8 - .if defined(PPP_CONFDIR) && !empty(PPP_CONFDIR) CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\" .endif Copied and modified: head/usr.sbin/ppp/ppp.8 (from r251278, head/usr.sbin/ppp/ppp.8.m4) ============================================================================== --- head/usr.sbin/ppp/ppp.8.m4 Sun Jun 2 23:25:27 2013 (r251278, copy source) +++ head/usr.sbin/ppp/ppp.8 Sun Jun 2 23:56:38 2013 (r251279) @@ -1,5 +1,3 @@ -changequote({,})dnl -changecom(,)dnl .\" .\" Copyright (c) 2001 Brian Somers .\" All rights reserved. @@ -65,10 +63,9 @@ This allows .Nm to act as a NAT or masquerading engine for all machines on an internal LAN. -ifdef({LOCALNAT},{},{Refer to +Refer to .Xr libalias 3 for details on the technical side of the NAT engine. -})dnl Refer to the .Sx NETWORK ADDRESS TRANSLATION (PACKET ALIASING) section of this manual page for details on how to configure NAT in @@ -313,14 +310,13 @@ 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. -ifdef({LOCALRAD},{},{If +If .Xr libradius 3 is available at compile time, .Nm will use it to make .Em RADIUS requests when configured to do so. -})dnl .It Supports Proxy Arp. .Nm can be configured to make one or more proxy arp entries on behalf of @@ -3018,9 +3014,9 @@ The option can only be enabled if networ With this option enabled, .Nm will pass traffic for old interface addresses through the NAT -ifdef({LOCALNAT},{engine,},{engine +engine (see -.Xr libalias 3 ) ,}) +.Xr libalias 3 ) , resulting in the ability (in .Fl auto mode) to properly connect the process that caused the PPP link to @@ -3428,18 +3424,17 @@ 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 does not already exist. -ifdef({LOCALNAT},{},{Refer to the +Refer to the .Sx CONCEPTUAL BACKGROUND section of .Xr libalias 3 for a description of what an .Dq aliasing link is. -})dnl .Pp It should be noted under what circumstances an aliasing link is -ifdef({LOCALNAT},{created.},{created by -.Xr libalias 3 .}) +created by +.Xr libalias 3 . It may be necessary to further protect your network from outside connections using the .Dq set filter @@ -3524,12 +3519,11 @@ for example: This command tells .Nm to proxy certain connections, redirecting them to a given server. -ifdef({LOCALNAT},{},{Refer to the description of +Refer to the description of .Fn PacketAliasProxyRule in .Xr libalias 3 for details of the available commands. -})dnl .It nat punch_fw Op Ar base count This command tells .Nm @@ -3567,9 +3561,8 @@ 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 -ifdef({LOCALNAT},{},{by libalias })dnl -to specify how to NAT incoming packets by default. +The target address is used 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 @@ -3577,10 +3570,7 @@ network. .Pp The target address may be set to .Dq MYADDR , -in which case -ifdef({LOCALNAT},{all packets will be redirected}, -{libalias will redirect all packets}) -to the interface address. +in which case 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 @@ -6055,10 +6045,8 @@ This socket is used to pass links betwee .Xr kldload 2 , .Xr pipe 2 , .Xr socketpair 2 , -ifdef({LOCALNAT},{},{.Xr libalias 3 , -})dnl -ifdef({LOCALRAD},{},{.Xr libradius 3 , -})dnl +.Xr libalias 3 , +.Xr libradius 3 , .Xr syslog 3 , .Xr uucplock 3 , .Xr netgraph 4 ,