From 19aa466a967aa15f873c49508342a235100056dc Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 13 Mar 2010 17:38:09 +0100 Subject: [PATCH] Fix compilation without TLS Signed-off-by: Johannes Schindelin --- libvncclient/rfbproto.c | 11 ++++++++++- libvncclient/vncviewer.c | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index 8aa6348..b31ca25 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -915,6 +915,10 @@ InitialiseRFBConnection(rfbClient* client) break; case rfbTLS: +#ifndef LIBVNCSERVER_WITH_CLIENT_TLS + rfbClientLog("TLS support was not compiled in\n"); + return FALSE; +#else if (!HandleAnonTLSAuth(client)) return FALSE; /* After the TLS session is established, sub auth types are expected. * Note that all following reading/writing are through the TLS session from here. @@ -944,10 +948,15 @@ InitialiseRFBConnection(rfbClient* client) (int)subAuthScheme); return FALSE; } +#endif break; case rfbVeNCrypt: +#ifndef LIBVNCSERVER_WITH_CLIENT_TLS + rfbClientLog("TLS support was not compiled in\n"); + return FALSE; +#else if (!HandleVeNCryptAuth(client)) return FALSE; switch (client->subAuthScheme) { @@ -973,7 +982,7 @@ InitialiseRFBConnection(rfbClient* client) client->subAuthScheme); return FALSE; } - +#endif break; default: diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c index 34de15d..094ba34 100644 --- a/libvncclient/vncviewer.c +++ b/libvncclient/vncviewer.c @@ -358,7 +358,9 @@ void rfbClientCleanup(rfbClient* client) { #endif #endif +#ifdef LIBVNCSERVER_WITH_CLIENT_TLS FreeTLS(client); +#endif if (client->sock >= 0) close(client->sock); if (client->listenSock >= 0)