summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/openvpn.83
-rw-r--r--src/openvpn/options.c2
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"