Log G-/K-Line changes only when not initiated by a server

[ngircd-alex.git] / src / ngircd / conf-ssl.h

diff --git a/src/ngircd/conf-ssl.h b/src/ngircd/conf-ssl.h
index 3fab579ca7c41983756d38dc3f968e1e2abfc2fe..af715af8c7c1b773680b63f14890663962467623 100644 (file)
--- a/src/ngircd/conf-ssl.h
+++ b/src/ngircd/conf-ssl.h
@@ -13,6 +13,10 @@
 #ifdef HAVE_LIBSSL
 #define SSL_SUPPORT
 #include <openssl/ssl.h>
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define OpenSSL_version SSLeay_version
+#define OPENSSL_VERSION SSLEAY_VERSION
+#endif
 #endif
 #ifdef HAVE_LIBGNUTLS
 #define SSL_SUPPORT
@@ -33,19 +37,16 @@ struct ConnSSL_State {
        SSL *ssl;
 #endif
 #ifdef HAVE_LIBGNUTLS
-       gnutls_session gnutls_session;
+       gnutls_session_t gnutls_session;
        void *cookie;           /* pointer to server configuration structure
                                   (for outgoing connections), or NULL. */
 #endif
+       char *fingerprint;
 };
 
-bool
-ConnSSL_InitLibrary(void);
-#else
-static inline bool
-ConnSSL_InitLibrary(void)
-{ return true; }
-#endif /* SSL_SUPPORT */
+#endif
+
+GLOBAL bool ConnSSL_InitLibrary PARAMS((void));
 
 #endif /* conf_ssl_h */