summaryrefslogtreecommitdiffstats
path: root/libvncclient/rfbproto.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2009-12-24 18:02:16 -0500
committerrunge <runge@karlrunge.com>2009-12-24 18:02:16 -0500
commit018f152bc5c99503d1f59b073046b2f5dca9b042 (patch)
tree07141108e937c59f87cd8ca211a376a52cfd136a /libvncclient/rfbproto.c
parentc96107783c89359781581cacc2fa46f8a979fc98 (diff)
parent743803facc6e4b933adca382db428be8b49a0d39 (diff)
downloadlibtdevnc-018f152bc5c99503d1f59b073046b2f5dca9b042.tar.gz
libtdevnc-018f152bc5c99503d1f59b073046b2f5dca9b042.zip
Merge branch 'master' of ssh://runge@libvncserver.git.sourceforge.net/gitroot/libvncserver/libvncserver
Diffstat (limited to 'libvncclient/rfbproto.c')
-rw-r--r--libvncclient/rfbproto.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 76b501a..d0e324d 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -809,7 +809,7 @@ InitialiseRFBConnection(rfbClient* client)
rfbClientLog("No authentication needed\n");
/* 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;
break;
@@ -838,7 +838,9 @@ InitialiseRFBConnection(rfbClient* client)
case rfbNoAuth:
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;
case rfbVncAuth: