svn merge -r 823:825 $SO/contrib/alon/BETA21/openvpn .

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

diff --git a/init.c b/init.c
index d6699e2d21caf1553a4b79c862486a33f67c0c48..20b6d8bbad235998c7a2a93f1c0b17f757cca4ae 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1670,7 +1670,8 @@ do_option_warnings (struct context *c)
   if (o->tls_client
       && !o->tls_verify
       && !o->tls_remote
-      && !(o->ns_cert_type & NS_SSL_SERVER))
+      && !(o->ns_cert_type & NS_SSL_SERVER)
+      && !o->remote_cert_eku[0])
     msg (M_WARN, "WARNING: No server certificate verification method has been enabled.  See http://openvpn.net/howto.html#mitm for more info.");
 #endif
 #endif