describe new behaviour with default IP address and noipdefault,

ipcp-accept-local and ipcp-accept-remote options.

diff --git a/pppd/pppd.8 b/pppd/pppd.8
index 699bccee927a9a608dd3ee8b7a5615fdf99527e3..474c589505bb8b8b223df7c88bb703f3a1ce48f8 100644 (file)
--- a/pppd/pppd.8
+++ b/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.0
-.\" $Id: pppd.8,v 1.1 1994/02/08 05:24:41 paulus Exp $
+.\" $Id: pppd.8,v 1.2 1994/02/08 23:50:51 paulus Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -111,10 +111,20 @@ old versions of \fIpppd\fR).
 .I <local_IP_address>\fB:\fI<remote_IP_address>
 Set the local and/or remote interface IP addresses.  Either one may be
 omitted.  The IP addresses can be specified with a host name or in
-"decimal dot" notation (e.g. "150.203.23.247").  The default local
-address is the (first) IP address of the system.  The remote address
-will be obtained from the peer if not specified in any option.  Thus,
-in simple cases, this option is not required.
+decimal dot notation (e.g. 150.234.56.78).  The default local
+address is the (first) IP address of the system (unless the
+.B noipdefault
+option is given).  The remote address will be obtained from the peer
+if not specified in any option.  Thus, in simple cases, this option is
+not required.
+If a local and/or remote IP address is specified with this option,
+.I pppd
+will not accept a different value from the peer in the IPCP
+negotiation, unless the
+.B ipcp-accept-local
+and/or
+.B ipcp-accept-remote
+options are given, respectively.
 .TP
 .B -all
 Don't request or allow negotiation of any options for LCP and IPCP (use
@@ -228,6 +238,13 @@ system.
 Use the system password database for authenticating the peer using
 PAP.
 .TP
+.B noipdefault
+Disables the default behaviour when no local IP address is specified,
+which is to determine (if possible) the local IP address from the
+hostname.  With this option, the peer will have to supply the local IP
+address during IPCP negotiation (unless it specified explicitly on the
+command line or in an options file).
+.TP
 .B lcp-restart \fI<n>
 Set the LCP restart interval (retransmission timeout) to <n> seconds
 (default 3).
@@ -280,6 +297,18 @@ Set the maximum number of CHAP challenge transmissions to <n> (default
 If this option is given,
 .I pppd
 will rechallenge the peer every <n> seconds.
+.TP
+.B ipcp-accept-local
+With this option,
+.I pppd
+will accept the peer's idea of our local IP address, even if the
+local IP address was specified in an option.
+.TP
+.B ipcp-accept-remote
+With this option,
+.I pppd
+will accept the peer's idea of its (remote) IP address, even if the
+remote IP address was specified in an option.
 .SH OPTIONS FILES
 Options can be taken from files as well as the command line.  
 .I pppd