diff options
| author | Bernhard Schmidt <berni@debian.org> | 2018-10-14 22:51:08 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2018-10-14 22:51:08 +0200 |
| commit | 87c2fd4310e5b345102d7a4915dc5e3a65052305 (patch) | |
| tree | b7dc3d6d209bdb926c9e1ece7f9639aa1724b39e /src/openvpn/options.c | |
| parent | 3804bc2606a92e2f2f4b3a2b043af0d77d92b386 (diff) | |
Revert "Merge branch 'stretch' of ssh://git.debian.org/git/collab-maint/openvpn into stretch"
This reverts commit 3804bc2606a92e2f2f4b3a2b043af0d77d92b386, reversing
changes made to 678cfd249add7ca758e4c41933c7b730132c99f4.
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 2f1b298..bfedb6a 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -198,7 +198,7 @@ static const char usage_message[] = " is established. Multiple routes can be specified.\n" " netmask default: 255.255.255.255\n" " gateway default: taken from --route-gateway or --ifconfig\n" - " Specify default by leaving blank or setting to \"default\".\n" + " Specify default by leaving blank or setting to \"nil\".\n" "--route-ipv6 network/bits [gateway] [metric] :\n" " Add IPv6 route to routing table after connection\n" " is established. Multiple routes can be specified.\n" @@ -6789,20 +6789,6 @@ add_option(struct options *options, options->port_share_port = p[2]; options->port_share_journal_dir = p[3]; } - else if (streq (p[0], "pkcs11-id-type") || - streq (p[0], "pkcs11-sign-mode") || - streq (p[0], "pkcs11-slot") || - streq (p[0], "pkcs11-slot-type") || - streq (p[0], "show-pkcs11-objects") || - streq (p[0], "show-pkcs11-slots")) - { - if (file) - msg (msglevel, "You are using an obsolete parameter in %s:%d: %s (%s).\nPlease see /usr/share/doc/openvpn/NEWS.Debian.gz for details.", - file, line, p[0], PACKAGE_VERSION); - else - msg (msglevel, "You are using an obsolete parameter: --%s (%s).\nPlease see /usr/share/doc/openvpn/NEWS.Debian.gz for details.", - p[0], PACKAGE_VERSION); - } #endif else if (streq(p[0], "client-to-client") && !p[1]) { |