diff options
author | bju <bju@maxi.fritz.box> | 2014-01-23 22:05:58 +0100 |
---|---|---|
committer | bju <bju@maxi.fritz.box> | 2014-01-23 22:05:58 +0100 |
commit | b58cae86e52d1f34c8e007e04f2dbc28650d8789 (patch) | |
tree | 2fd8c5739f7ab4f76279a61dec6539a8532b486d /vdr-vdrmanager/serversock.cpp | |
parent | 612e0e00b8d55b70d4b83d13fc75e7ddd78d2b58 (diff) | |
download | vdr-manager-b58cae86e52d1f34c8e007e04f2dbc28650d8789.tar.gz vdr-manager-b58cae86e52d1f34c8e007e04f2dbc28650d8789.tar.bz2 |
- Giving VDRMANAGER_USE_{SSL,GZIP,ZLIB}=0 (default is 1) to the make call
SSL support and the compression methods can be disabled. This eliminates
the compile time and also the runtime dependencies.
- The Gentoo ebuils uses the USE flags "ssl", "gzip" and "zlib" to control
the SSL and compress features.
Diffstat (limited to 'vdr-vdrmanager/serversock.cpp')
-rw-r--r-- | vdr-vdrmanager/serversock.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vdr-vdrmanager/serversock.cpp b/vdr-vdrmanager/serversock.cpp index 927a788..e118b0b 100644 --- a/vdr-vdrmanager/serversock.cpp +++ b/vdr-vdrmanager/serversock.cpp @@ -3,7 +3,11 @@ */ #include <unistd.h> #include <vdr/plugin.h> + +#if VDRMANAGER_USE_SSL #include <openssl/err.h> +#endif + #include "serversock.h" #include "helpers.h" #include "compressor.h" @@ -19,8 +23,10 @@ cVdrmanagerServerSocket::cVdrmanagerServerSocket() : cVdrmanagerSocket() { } cVdrmanagerServerSocket::~cVdrmanagerServerSocket() { +#if VDRMANAGER_USE_SSL if (sslCtx) SSL_CTX_free(sslCtx); +#endif } bool cVdrmanagerServerSocket::Create(int port, const char * password, bool forceCheckSvrp, int compressionMode, @@ -68,6 +74,8 @@ bool cVdrmanagerServerSocket::Create(int port, const char * password, bool force return false; } +#if VDRMANAGER_USE_SSL + if (certFile) { isyslog("[vdrmanager] initialize SSL"); @@ -104,6 +112,7 @@ bool cVdrmanagerServerSocket::Create(int port, const char * password, bool force SSL_CTX_set_mode(sslCtx, SSL_MODE_ENABLE_PARTIAL_WRITE); } +#endif return true; } |