Documented --route-nopull.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@767 e7ae566f-a301-0410-adde-c780ea21d3b5

3 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f763919..3d9dfe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $Id$
   on Linux clients to fail.
 * Moved easy-rsa 2.0 scripts to easy-rsa/2.0 to
   be compatible with 2.0.x distribution.
+* Documented --route-nopull.
 
 2005.11.01 -- Version 2.1-beta6
 
diff --git a/openvpn.8 b/openvpn.8
index 78c6007..6bfe5a3 100644
--- a/openvpn.8
+++ b/openvpn.8
@@ -235,6 +235,7 @@ openvpn \- secure IP tunnel daemon.
 [\ \fB\-\-route\-gateway\fR\ \fIgw\fR\ ]
 [\ \fB\-\-route\-method\fR\ \fIm\fR\ ]
 [\ \fB\-\-route\-noexec\fR\ ]
+[\ \fB\-\-route\-nopull\fR\ ]
 [\ \fB\-\-route\-up\fR\ \fIcmd\fR\ ]
 [\ \fB\-\-route\fR\ \fInetwork\ [netmask]\ [gateway]\ [metric]\fR\ ]
 [\ \fB\-\-rport\fR\ \fIport\fR\ ]
@@ -1087,6 +1088,19 @@ Don't add or remove routes automatically.  Instead pass routes to
 script using environmental variables.
 .\"*********************************************************
 .TP
+.B --route-nopull
+When used with
+.B --client
+or
+.B --pull,
+accept options pushed by server EXCEPT for routes.
+
+When used on the client, this option effectively bars the
+server from adding routes to the client's routing table,
+however note that this option still allows the server
+to set the TCP/IP properties of the client's TUN/TAP interface.
+.\"*********************************************************
+.TP
 .B --redirect-gateway flags...
 (Experimental) Automatically execute routing commands to cause all outgoing IP traffic
 to be redirected over the VPN.
diff --git a/options.c b/options.c
index 9231110..ea00128 100644
--- a/options.c
+++ b/options.c
@@ -165,6 +165,8 @@ static const char usage_message[] =
   "--route-up cmd  : Execute shell cmd after routes are added.\n"
   "--route-noexec  : Don't add routes automatically.  Instead pass routes to\n"
   "                  --route-up script using environmental variables.\n"
+  "--route-nopull  : When used with --client or --pull, accept options pushed\n"
+  "                  by server EXCEPT for routes.\n"
   "--redirect-gateway [flags]: (Experimental) Automatically execute routing\n"
   "                  commands to redirect all outgoing IP traffic through the\n"
   "                  VPN.  Add 'local' flag if both " PACKAGE_NAME " servers are directly\n"