diff options
| author | runge <runge@karlrunge.com> | 2009-12-24 18:02:16 -0500 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2009-12-24 18:02:16 -0500 |
| commit | 018f152bc5c99503d1f59b073046b2f5dca9b042 (patch) | |
| tree | 07141108e937c59f87cd8ca211a376a52cfd136a | |
| parent | c96107783c89359781581cacc2fa46f8a979fc98 (diff) | |
| parent | 743803facc6e4b933adca382db428be8b49a0d39 (diff) | |
| download | libvncserver-018f152bc5c99503d1f59b073046b2f5dca9b042.zip libvncserver-018f152bc5c99503d1f59b073046b2f5dca9b042.tar.gz | |
Merge branch 'master' of ssh://runge@libvncserver.git.sourceforge.net/gitroot/libvncserver/libvncserver
| -rw-r--r-- | libvncclient/rfbproto.c | 6 |
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: |
