summaryrefslogtreecommitdiff
path: root/openvpn
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-02 13:48:38 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-02 13:48:38 +0200
commitb84e3939a015b42c316af0b63297932e6fcf8ba4 (patch)
treed20b3b0553e88bc34789827da9b63150283aff90 /openvpn
parent23c305fb6b9d4b0fdfd453c42726c72c523d60cb (diff)
clarify warning, reset domain on opening tun
Diffstat (limited to 'openvpn')
-rw-r--r--openvpn/src/openvpn/options.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c
index dae36103..dcb6340e 100644
--- a/openvpn/src/openvpn/options.c
+++ b/openvpn/src/openvpn/options.c
@@ -228,7 +228,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"
@@ -4029,18 +4029,19 @@ void options_string_import (struct options *options,
#if P2MP
-#define VERIFY_PERMISSION(mask) { if (!verify_permission(p[0], (mask), permission_mask, option_types_found, msglevel)) goto err; }
+#define VERIFY_PERMISSION(mask) { if (!verify_permission(p[0], file, (mask), permission_mask, option_types_found, msglevel)) goto err; }
static bool
verify_permission (const char *name,
- const unsigned int type,
+ const char* file,
+ const unsigned int type,
const unsigned int allowed,
unsigned int *found,
const int msglevel)
{
if (!(type & allowed))
{
- msg (msglevel, "option '%s' cannot be used in this context", name);
+ msg (msglevel, "option '%s' cannot be used in this context (%s)", name, file);
return false;
}
else