Commit 018f152b authored by runge's avatar runge

Merge branch 'master' of...

Merge branch 'master' of ssh://runge@libvncserver.git.sourceforge.net/gitroot/libvncserver/libvncserver
parents c9610778 743803fa
...@@ -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