Man page and usage message changes to reflect

--ip-win32 adaptive and --route-method adaptive.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@859 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/openvpn.8 b/openvpn.8
index 3b14a3ed08adc6bbe683151f4de0f8f1181f99a4..6a92cac2a12d7d6c12130aa7df580c064d46ef7a 100644 (file)
--- a/openvpn.8
+++ b/openvpn.8
@@ -4347,8 +4347,12 @@ Which method
 .B m
 to use for adding routes on Windows?
 
+.B adaptive
+(default) -- Try IP helper API first.  If that fails, fall
+back to the route.exe shell command.
+.br
 .B ipapi
-(default) -- Use IP helper API.
+-- Use IP helper API.
 .br
 .B exe
 -- Call the route.exe shell command.
@@ -4357,7 +4361,9 @@ to use for adding routes on Windows?
 .B --dhcp-option type [parm]
 Set extended TAP-Win32 TCP/IP properties, must
 be used with
-.B --ip-win32 dynamic.
+.B --ip-win32 dynamic
+or
+.B --ip-win32 adaptive.
 This option can be used to set additional TCP/IP properties
 on the TAP-Win32 adapter, and is particularly useful for
 configuring an OpenVPN client to access a Samba server

diff --git a/options.c b/options.c
index 6614c3e3a603f875c68421e8bd6bd0c65f9cdd95..903cb7dc99567b9995e0391d8e1e05f992c3fa9d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -530,7 +530,8 @@ static const char usage_message[] =
   "                    lease-time: Lease time in seconds.\n"
   "                                Default is one year.\n"
   "--route-method    : Which method to use for adding routes on Windows?\n"
-  "                    ipapi (default) -- Use IP helper API.\n"
+  "                    adaptive (default) -- Try ipapi then fall back to exe.\n"
+  "                    ipapi -- Use IP helper API.\n"
   "                    exe -- Call the route.exe shell command.\n"
   "--dhcp-option type [parm] : Set extended TAP-Win32 properties, must\n"
   "                    be used with --ip-win32 dynamic.  For options\n"