diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2014-07-17 19:48:55 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2014-07-17 19:48:55 +0000 |
| commit | f0d8951cd200b9abeca00eb92b07ec309bca5739 (patch) | |
| tree | 1df8837d4697862000e50eefa42657c422f1f804 /modules | |
| parent | d3c4da014fc5ea559c59ea019da10276985deebc (diff) | |
- m_server.c: fixed build with LibreSSL which hasn't compression support
- ax_check_openssl.m4: 0.9.8m is now the minimum requirement
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@4248 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/m_server.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/modules/core/m_server.c b/modules/core/m_server.c index c8cefe7..2e0ed8d 100644 --- a/modules/core/m_server.c +++ b/modules/core/m_server.c @@ -260,7 +260,7 @@ server_estab(struct Client *client_p) const char *inpath; static char inpath_ip[HOSTLEN * 2 + USERLEN + 6]; dlink_node *ptr; -#ifdef HAVE_LIBCRYPTO +#if defined(HAVE_LIBCRYPTO) && !defined(OPENSSL_NO_COMP) const COMP_METHOD *compression = NULL, *expansion = NULL; #endif @@ -369,30 +369,43 @@ server_estab(struct Client *client_p) #ifdef HAVE_LIBCRYPTO if (client_p->localClient->fd.ssl) { +#ifndef OPENSSL_NO_COMP compression = SSL_get_current_compression(client_p->localClient->fd.ssl); expansion = SSL_get_current_expansion(client_p->localClient->fd.ssl); - +#endif sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)", inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl), +#ifndef OPENSSL_NO_COMP compression ? SSL_COMP_get_name(compression) : "NONE", expansion ? SSL_COMP_get_name(expansion) : "NONE", +#else + "NONE", "NONE", +#endif show_capabilities(client_p)); /* Now show the masked hostname/IP to opers */ sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)", inpath, ssl_get_cipher(client_p->localClient->fd.ssl), +#ifndef OPENSSL_NO_COMP compression ? SSL_COMP_get_name(compression) : "NONE", expansion ? SSL_COMP_get_name(expansion) : "NONE", +#else + "NONE", "NONE", +#endif show_capabilities(client_p)); ilog(LOG_TYPE_IRCD, "Link with %s established: [SSL: %s, Compression/Expansion method: %s/%s] (Capabilities: %s)", inpath_ip, ssl_get_cipher(client_p->localClient->fd.ssl), +#ifndef OPENSSL_NO_COMP compression ? SSL_COMP_get_name(compression) : "NONE", expansion ? SSL_COMP_get_name(expansion) : "NONE", +#else + "NONE", "NONE", +#endif show_capabilities(client_p)); } else -#endif +#endif { sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE, "Link with %s established: (Capabilities: %s)", |