diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-06-02 15:03:39 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-06-07 14:00:43 +0200 |
| commit | 97235cc7077630004e11d6d44862c3bb7e49a40e (patch) | |
| tree | 8b80bdf17ecca4211290f4a7ec4d733e5ae66136 | |
| parent | 803613de394a0b25374797d001d4a2cdea8b593e (diff) | |
| download | openvpn-97235cc7077630004e11d6d44862c3bb7e49a40e.tar.gz openvpn-97235cc7077630004e11d6d44862c3bb7e49a40e.tar.xz openvpn-97235cc7077630004e11d6d44862c3bb7e49a40e.zip | |
Explain that route-nopull also causes the client to ignore dhcp options.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1338642223-20324-5-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/6649
Signed-off-by: David Sommerseth <davids@redhat.com>
| -rw-r--r-- | doc/openvpn.8 | 3 | ||||
| -rw-r--r-- | src/openvpn/options.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 24b1a2c..f420d58 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -1087,7 +1087,8 @@ When used with .B \-\-client or .B \-\-pull, -accept options pushed by server EXCEPT for routes. +accept options pushed by server EXCEPT for routes and dhcp options +like DNS servers. When used on the client, this option effectively bars the server from adding routes to the client's routing table, diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 08f9cb2..2f70839 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -231,7 +231,7 @@ static const char usage_message[] = "--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" + " by server EXCEPT for routes and dhcp options.\n" "--allow-pull-fqdn : Allow client to pull DNS names from server for\n" " --ifconfig, --route, and --route-gateway.\n" "--redirect-gateway [flags]: Automatically execute routing\n" |