Commit 19aa466a authored by Johannes Schindelin's avatar Johannes Schindelin

Fix compilation without TLS

Signed-off-by: 's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent 14854d2e
...@@ -915,6 +915,10 @@ InitialiseRFBConnection(rfbClient* client) ...@@ -915,6 +915,10 @@ InitialiseRFBConnection(rfbClient* client)
break; break;
case rfbTLS: case rfbTLS:
#ifndef LIBVNCSERVER_WITH_CLIENT_TLS
rfbClientLog("TLS support was not compiled in\n");
return FALSE;
#else
if (!HandleAnonTLSAuth(client)) return FALSE; if (!HandleAnonTLSAuth(client)) return FALSE;
/* After the TLS session is established, sub auth types are expected. /* After the TLS session is established, sub auth types are expected.
* Note that all following reading/writing are through the TLS session from here. * Note that all following reading/writing are through the TLS session from here.
...@@ -944,10 +948,15 @@ InitialiseRFBConnection(rfbClient* client) ...@@ -944,10 +948,15 @@ InitialiseRFBConnection(rfbClient* client)
(int)subAuthScheme); (int)subAuthScheme);
return FALSE; return FALSE;
} }
#endif
break; break;
case rfbVeNCrypt: case rfbVeNCrypt:
#ifndef LIBVNCSERVER_WITH_CLIENT_TLS
rfbClientLog("TLS support was not compiled in\n");
return FALSE;
#else
if (!HandleVeNCryptAuth(client)) return FALSE; if (!HandleVeNCryptAuth(client)) return FALSE;
switch (client->subAuthScheme) { switch (client->subAuthScheme) {
...@@ -973,7 +982,7 @@ InitialiseRFBConnection(rfbClient* client) ...@@ -973,7 +982,7 @@ InitialiseRFBConnection(rfbClient* client)
client->subAuthScheme); client->subAuthScheme);
return FALSE; return FALSE;
} }
#endif
break; break;
default: default:
......
...@@ -358,7 +358,9 @@ void rfbClientCleanup(rfbClient* client) { ...@@ -358,7 +358,9 @@ void rfbClientCleanup(rfbClient* client) {
#endif #endif
#endif #endif
#ifdef LIBVNCSERVER_WITH_CLIENT_TLS
FreeTLS(client); FreeTLS(client);
#endif
if (client->sock >= 0) if (client->sock >= 0)
close(client->sock); close(client->sock);
if (client->listenSock >= 0) if (client->listenSock >= 0)
......
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