Commit 743803fa authored by Vic Lee's avatar Vic Lee Committed by Johannes Schindelin

Fix version checking (>=3.8) for rfbVncAuthOK confirmation when no password required

It seems that vino does not send AuthOK  when there is no password with
anonymous TLS, and it seems that vino is the only <3.8 VNC server that
handles anonymous TLS at all, so let's not wait for the packet that will
never come.
Signed-off-by: 's avatarVic Lee <llyzs@163.com>
Signed-off-by: 's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent 9659bc12
...@@ -809,7 +809,7 @@ InitialiseRFBConnection(rfbClient* client) ...@@ -809,7 +809,7 @@ InitialiseRFBConnection(rfbClient* client)
rfbClientLog("No authentication needed\n"); rfbClientLog("No authentication needed\n");
/* 3.8 and upwards sends a Security Result for rfbNoAuth */ /* 3.8 and upwards sends a Security Result for rfbNoAuth */
if (client->major==3 && client->minor > 7) if ((client->major==3 && client->minor > 7) || client->major>3)
if (!rfbHandleAuthResult(client)) return FALSE; if (!rfbHandleAuthResult(client)) return FALSE;
break; break;
...@@ -838,7 +838,9 @@ InitialiseRFBConnection(rfbClient* client) ...@@ -838,7 +838,9 @@ InitialiseRFBConnection(rfbClient* client)
case rfbNoAuth: case rfbNoAuth:
rfbClientLog("No sub authentication needed\n"); rfbClientLog("No sub authentication needed\n");
if (!rfbHandleAuthResult(client)) return FALSE; /* 3.8 and upwards sends a Security Result for rfbNoAuth */
if ((client->major==3 && client->minor > 7) || client->major>3)
if (!rfbHandleAuthResult(client)) return FALSE;
break; break;
case rfbVncAuth: case rfbVncAuth:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment