Re-apply: OpenVPN: Fix daemon stuck in WAIT state.

When the client is in the WAIT state, it is usally connected
to the server.

Conflicts:
	html/cgi-bin/index.cgi
	html/cgi-bin/ovpnmain.cgi

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index a051b5d83249cfed71e3c32fa08ec05722d284f8..8390be05846184a5a5add02af36440b8a3d23c8a 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5177,7 +5177,7 @@ END
 #EXITING       -- A graceful exit is in progress.
 ####
 
 #EXITING       -- A graceful exit is in progress.
 ####
 

-               if ($tustate[1] eq 'CONNECTED') {
+               if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) {

                        $col1="bgcolor='${Header::colourgreen}'";
                        $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
                }else {
                        $col1="bgcolor='${Header::colourgreen}'";
                        $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
                }else {