diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2010-03-13 17:38:09 +0100 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2010-03-13 17:38:09 +0100 |
| commit | 19aa466a967aa15f873c49508342a235100056dc (patch) | |
| tree | c04576193d91af345dc3ea2fc5df160491a78c8f | |
| parent | 14854d2e5ee39dd8cffc246f85ee2a0b5c9dcf1f (diff) | |
| download | libtdevnc-19aa466a.tar.gz libtdevnc-19aa466a.zip | |
Fix compilation without TLS
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| -rw-r--r-- | libvncclient/rfbproto.c | 11 | ||||
| -rw-r--r-- | libvncclient/vncviewer.c | 2 |
2 files changed, 12 insertions, 1 deletions
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) |