Correctly state the default dhcp server address in man page

Also correct the default ifconfig-pool end in docs and comments

Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1480707729-19578-1-git-send-email-selva.nair@gmail.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13387.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 251cc8f2042cc0cb8281230f7fb33f2cdec5b809)

diff --git a/doc/openvpn.8 b/doc/openvpn.8
index 3c0cd415618f92ae6b3f7944aa1f1caa5d8e08ac..214073387005417c031686f0f254cb501cede23f 100644 (file)
--- a/doc/openvpn.8
+++ b/doc/openvpn.8
@@ -2754,10 +2754,10 @@ expands as follows:
  if dev tap OR (dev tun AND topology == subnet):
    ifconfig 10.8.0.1 255.255.255.0
    if !nopool:
-     ifconfig-pool 10.8.0.2 10.8.0.254 255.255.255.0
-   push "route-gateway 10.8.0.1"
-   if route-gateway unset:
-     route-gateway 10.8.0.2
+     ifconfig\-pool 10.8.0.2 10.8.0.253 255.255.255.0
+   push "route\-gateway 10.8.0.1"
+   if route\-gateway unset:
+     route\-gateway 10.8.0.2
 
 .in -4
 .ft
@@ -5362,7 +5362,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 -1.
 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/helper.c b/src/openvpn/helper.c
index 62f88eccc366d5802fd1c9d11545af340922477d..30892171c6a3c633517962833c39d6eeddd2e655 100644 (file)
--- a/src/openvpn/helper.c
+++ b/src/openvpn/helper.c
@@ -230,7 +230,7 @@ helper_client_server (struct options *o)
    * if tap OR (tun AND topology == subnet):
    *   ifconfig 10.8.0.1 255.255.255.0
    *   if !nopool: 
-   *     ifconfig-pool 10.8.0.2 10.8.0.254 255.255.255.0
+   *     ifconfig-pool 10.8.0.2 10.8.0.253 255.255.255.0
    *   push "route-gateway 10.8.0.1"
    *   if route-gateway unset:
    *     route-gateway 10.8.0.2