--ip-win32 adaptive is now the default.

--ip-win32 netsh (or --ip-win32 adaptive when in netsh
mode) can now set DNS/WINS addresses on the TAP-Win32
adapter.


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

1 files changed, 12 insertions, 2 deletions

diff --git a/init.c b/init.c
index 8e730f1..930d220 100644
--- a/init.c
+++ b/init.c
@@ -75,8 +75,10 @@ void
 context_clear_all_except_first_time (struct context *c)
 {
   const bool first_time_save = c->first_time;
+  const struct context_persist cpsave = c->persist;
   context_clear (c);
   c->first_time = first_time_save;
+  c->persist = cpsave;
 }
 
 /*
@@ -630,11 +632,15 @@ initialization_sequence_completed (struct context *c, const unsigned int flags)
 
   /* Test if errors */
   if (flags & ISC_ERRORS)
+    {
 #ifdef WIN32
-    msg (M_INFO, "%s With Errors ( see http://openvpn.net/faq.html#dhcpclientserv )", message);
+      show_routes (M_INFO|M_NOPREFIX);
+      show_adapters (M_INFO|M_NOPREFIX);
+      msg (M_INFO, "%s With Errors ( see http://openvpn.net/faq.html#dhcpclientserv )", message);
 #else
-    msg (M_INFO, "%s With Errors", message);
+      msg (M_INFO, "%s With Errors", message);
 #endif
+    }
   else
     msg (M_INFO, "%s", message);
 
@@ -1165,6 +1171,10 @@ socket_restart_pause (struct context *c)
     sec = 10;
 #endif
 
+  if (c->persist.restart_sleep_seconds > 0 && c->persist.restart_sleep_seconds > sec)
+    sec = c->persist.restart_sleep_seconds;
+  c->persist.restart_sleep_seconds = 0;
+
   if (do_hold (NULL))
     sec = 0;