Incorporate the Debian typo fixes where appropriate and make show_opt default message...

Debian also incorrectly changes that the default for route parameters can
be specified by using "nil" instead of "default. The confusion is probably
coming from show_opt printing "nil" instead of "default". Change show_opt
to show "default (not set)" instead of "nil"

Original author: Alberto Gonzalez Iniesta <agi@inittab.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1468495519-25102-1-git-send-email-arne@rfc2549.org>
URL: http://www.mail-archive.com/search?l=mid&q=1468495519-25102-1-git-send-email-arne@rfc2549.org

Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit c42fcbfe708f4c97da063642cf8874f0d4d1a645)

diff --git a/doc/openvpn.8 b/doc/openvpn.8
index d9bb77c1812241df6bd92807ef5c97d7b960ff15..f30cf380ceb086487b33868b21508732044d3d5d 100644 (file)
--- a/doc/openvpn.8
+++ b/doc/openvpn.8
@@ -21,13 +21,13 @@
 .\"  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 .\"
 .\" Manual page for openvpn
-.\
+.\"
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
 .\" IP indented paragraph
 .\" TP hanging label
-.\
+.\"
 .\" .nf -- no formatting
 .\" .fi -- resume formatting
 .\" .ft 3 -- boldface
@@ -4031,7 +4031,7 @@ is 15 seconds.
 This option is only relevant in UDP mode, i.e.
 when either
 .B \-\-proto udp
-is specifed, or no
+is specified, or no
 .B \-\-proto
 option is specified.
 
@@ -5304,7 +5304,7 @@ virtual DHCP server address.  In
 .B \-\-dev tun
 mode, OpenVPN will cause the DHCP server to masquerade as if it were
 coming from the remote endpoint.  The optional offset parameter is
-an integer which is > -256 and < 256 and which defaults to 0.
+an integer which is > \-256 and < 256 and which defaults to 0.
 If offset is positive, the DHCP server will masquerade as the IP
 address at network address + offset.
 If offset is negative, the DHCP server will masquerade as the IP

diff --git a/src/openvpn/occ.c b/src/openvpn/occ.c
index ff48706962543562680338bbbae0389665e97a7d..d71381df699604c943bd6376a1f5f2d3e0a1e2ca 100644 (file)
--- a/src/openvpn/occ.c
+++ b/src/openvpn/occ.c
@@ -379,7 +379,7 @@ process_received_occ_msg (struct context *c)
              && c->c2.max_send_size_local > TUN_MTU_MIN
              && (c->c2.max_recv_size_remote < c->c2.max_send_size_local
                  || c->c2.max_recv_size_local < c->c2.max_send_size_remote))
-           msg (M_INFO, "NOTE: This connection is unable to accomodate a UDP packet size of %d. Consider using --fragment or --mssfix options as a workaround.",
+           msg (M_INFO, "NOTE: This connection is unable to accommodate a UDP packet size of %d. Consider using --fragment or --mssfix options as a workaround.",
                 c->c2.max_send_size_local);
        }
       event_timeout_clear (&c->c2.occ_mtu_load_test_interval);

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index 827bd79cdc7e253fc87cfd1eba1651335252e5f9..68857e8d7ce19072e87d645c988d4a8d185832fd 100644 (file)
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -1098,7 +1098,7 @@ static const char *
 show_opt (const char *option)
 {
   if (!option)
-    return "nil";
+    return "default (not set)";
   else
     return option;
 }