mirror of https://github.com/Icinga/icinga2.git
Even more bugfixes.
This commit is contained in:
parent
6b01b57686
commit
d4fb11d427
4
README
4
README
|
@ -20,8 +20,8 @@ mentioned above:
|
|||
* GNU Automake (automake)
|
||||
* GNU Autoconf (autoconf)
|
||||
* GNU Libtool (libtool, libtool-ltdl-devel)
|
||||
* optional: GNU bison (bison)
|
||||
* optional: GNU flex (flex)
|
||||
* GNU bison (bison)
|
||||
* GNU flex (flex)
|
||||
|
||||
Debian Packages
|
||||
---------------
|
||||
|
|
|
@ -118,9 +118,7 @@ void TlsClient::ReadableEventHandler(void)
|
|||
rc = SSL_read(m_SSL.get(), buffer, bufferSize);
|
||||
|
||||
if (rc <= 0) {
|
||||
int error = SSL_get_error(m_SSL.get(), rc);
|
||||
|
||||
switch (error) {
|
||||
switch (SSL_get_error(m_SSL.get(), rc)) {
|
||||
case SSL_ERROR_WANT_WRITE:
|
||||
m_BlockRead = true;
|
||||
/* fall through */
|
||||
|
@ -131,7 +129,7 @@ void TlsClient::ReadableEventHandler(void)
|
|||
return;
|
||||
default:
|
||||
HandleSocketError(OpenSSLException(
|
||||
"SSL_read failed", error));
|
||||
"SSL_read failed", ERR_get_error()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -156,8 +154,7 @@ void TlsClient::WritableEventHandler(void)
|
|||
rc = SSL_write(m_SSL.get(), (const char *)GetSendQueue()->GetReadBuffer(), write_size);
|
||||
|
||||
if (rc <= 0) {
|
||||
int error = SSL_get_error(m_SSL.get(), rc);
|
||||
switch (error) {
|
||||
switch (SSL_get_error(m_SSL.get(), rc)) {
|
||||
case SSL_ERROR_WANT_READ:
|
||||
m_BlockWrite = true;
|
||||
/* fall through */
|
||||
|
@ -168,7 +165,7 @@ void TlsClient::WritableEventHandler(void)
|
|||
return;
|
||||
default:
|
||||
HandleSocketError(OpenSSLException(
|
||||
"SSL_write failed", error));
|
||||
"SSL_write failed", ERR_get_error()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,7 +63,6 @@ private:
|
|||
void AdjustCheckTimer(void);
|
||||
|
||||
void AssignServiceRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
|
||||
void RevokeServiceRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
|
||||
void ClearServicesRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
|
||||
};
|
||||
|
||||
|
|
|
@ -50,7 +50,6 @@ AM_PROG_LEX
|
|||
AC_PROG_YACC
|
||||
AC_PROG_LIBTOOL
|
||||
AX_CXX_GCC_ABI_DEMANGLE
|
||||
AX_PTHREAD
|
||||
AX_BOOST_BASE
|
||||
AX_BOOST_SIGNALS
|
||||
AX_BOOST_THREAD
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
|
||||
noinst_LTLIBRARIES = \
|
||||
pkglib_LTLIBRARIES = \
|
||||
libpopen_noshell.la
|
||||
|
||||
libpopen_noshell_la_SOURCES = \
|
||||
libpopen_noshell_la_SOURCES = \
|
||||
popen_noshell.c \
|
||||
popen_noshell.h
|
||||
|
||||
libpopen_noshell_la_LDFLAGS = \
|
||||
-z now
|
||||
|
|
Loading…
Reference in New Issue