diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-04-05 18:38:35 -0500 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-04-05 18:38:35 -0500 |
| commit | 646f844f69cc74b8eebf25cc76663b2ee851e5d3 (patch) | |
| tree | 78bd6209e630a980715f30c152365853c9021ece /libvncclient | |
| parent | 817f6e658d0cec41088692e2424d5d7b1a20a333 (diff) | |
| parent | a705cd625cd4ae61ba05cb8333a46662429ca6a1 (diff) | |
| download | libvncserver-646f844f69cc74b8eebf25cc76663b2ee851e5d3.zip libvncserver-646f844f69cc74b8eebf25cc76663b2ee851e5d3.tar.gz | |
Merge branch 'repeater'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Conflicts:
.gitignore
Diffstat (limited to 'libvncclient')
| -rw-r--r-- | libvncclient/rfbproto.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index 958780c..f5185ca 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -578,6 +578,9 @@ ReadSupportedSecurityType(rfbClient* client, uint32_t *result, rfbBool subAuth) rfbClientLog("%d) Received security type %d\n", loop, tAuth[loop]); if (flag) continue; if (tAuth[loop]==rfbVncAuth || tAuth[loop]==rfbNoAuth || +#if defined(LIBVNCSERVER_HAVE_GNUTLS) || defined(LIBVNCSERVER_HAVE_LIBSSL) + tAuth[loop]==rfbVeNCrypt || +#endif (tAuth[loop]==rfbARD && client->GetCredential) || (!subAuth && (tAuth[loop]==rfbTLS || (tAuth[loop]==rfbVeNCrypt && client->GetCredential)))) { |
