diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 15:49:20 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-17 15:49:20 +0200 |
| commit | e61672c6932868d6b09ad0ae8453dc91c545742f (patch) | |
| tree | 24797dc3cb54f126139af2481c3b58a57652f9b5 /runtime/nsd_gtls.c | |
| parent | 16f06168e10d0315cc5d65516043809edd9d2232 (diff) | |
| download | rsyslog-e61672c6932868d6b09ad0ae8453dc91c545742f.tar.gz rsyslog-e61672c6932868d6b09ad0ae8453dc91c545742f.tar.xz rsyslog-e61672c6932868d6b09ad0ae8453dc91c545742f.zip | |
removed dependency on gcrypt for recently-enough GnuTLS
see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
Diffstat (limited to 'runtime/nsd_gtls.c')
| -rw-r--r-- | runtime/nsd_gtls.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index ca4b2928..9dda795d 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -29,7 +29,9 @@ #include <string.h> #include <gnutls/gnutls.h> #include <gnutls/x509.h> -#include <gcrypt.h> +#if GNUTLS_VERSION_NUMBER <= 0x020b00 +# include <gcrypt.h> +#endif #include <errno.h> #include <sys/stat.h> #include <unistd.h> @@ -563,7 +565,9 @@ gtlsGlblInit(void) DEFiRet; /* gcry_control must be called first, so that the thread system is correctly set up */ + #if GNUTLS_VERSION_NUMBER <= 0x020b00 gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + #endif CHKgnutls(gnutls_global_init()); /* X509 stuff */ |