tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Even more bugfixes.

This commit is contained in:
Gunnar Beutner 2012-06-21 16:16:53 +02:00
parent 6b01b57686
commit d4fb11d427
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -20,8 +20,8 @@ mentioned above:
* GNU Automake (automake) * GNU Automake (automake)
* GNU Autoconf (autoconf) * GNU Autoconf (autoconf)
* GNU Libtool (libtool, libtool-ltdl-devel) * GNU Libtool (libtool, libtool-ltdl-devel)
* optional: GNU bison (bison) * GNU bison (bison)
* optional: GNU flex (flex) * GNU flex (flex)
Debian Packages Debian Packages
--------------- ---------------

11
base/tlsclient.cpp
View File

@ -118,9 +118,7 @@ void TlsClient::ReadableEventHandler(void)
rc = SSL_read(m_SSL.get(), buffer, bufferSize); rc = SSL_read(m_SSL.get(), buffer, bufferSize);
if (rc <= 0) { if (rc <= 0) {
int error = SSL_get_error(m_SSL.get(), rc); switch (SSL_get_error(m_SSL.get(), rc)) {
switch (error) {
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
m_BlockRead = true; m_BlockRead = true;
/* fall through */ /* fall through */
@ -131,7 +129,7 @@ void TlsClient::ReadableEventHandler(void)
return; return;
default: default:
HandleSocketError(OpenSSLException( HandleSocketError(OpenSSLException(
"SSL_read failed", error)); "SSL_read failed", ERR_get_error()));
return; return;
} }
} }
@ -156,8 +154,7 @@ void TlsClient::WritableEventHandler(void)
rc = SSL_write(m_SSL.get(), (const char *)GetSendQueue()->GetReadBuffer(), write_size); rc = SSL_write(m_SSL.get(), (const char *)GetSendQueue()->GetReadBuffer(), write_size);
if (rc <= 0) { if (rc <= 0) {
int error = SSL_get_error(m_SSL.get(), rc); switch (SSL_get_error(m_SSL.get(), rc)) {
switch (error) {
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
m_BlockWrite = true; m_BlockWrite = true;
/* fall through */ /* fall through */
@ -168,7 +165,7 @@ void TlsClient::WritableEventHandler(void)
return; return;
default: default:
HandleSocketError(OpenSSLException( HandleSocketError(OpenSSLException(
"SSL_write failed", error)); "SSL_write failed", ERR_get_error()));
return; return;
} }
} }

1
components/checker/checkercomponent.h
View File

@ -63,7 +63,6 @@ private:
void AdjustCheckTimer(void); void AdjustCheckTimer(void);
void AssignServiceRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request); 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); void ClearServicesRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request);
}; };

1
configure.ac
View File

@ -50,7 +50,6 @@ AM_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AX_CXX_GCC_ABI_DEMANGLE AX_CXX_GCC_ABI_DEMANGLE
AX_PTHREAD
AX_BOOST_BASE AX_BOOST_BASE
AX_BOOST_SIGNALS AX_BOOST_SIGNALS
AX_BOOST_THREAD AX_BOOST_THREAD

7
third-party/popen-noshell/Makefile.am vendored
View File

@ -1,9 +1,12 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
noinst_LTLIBRARIES = \ pkglib_LTLIBRARIES = \
libpopen_noshell.la libpopen_noshell.la
libpopen_noshell_la_SOURCES = \ libpopen_noshell_la_SOURCES = \
popen_noshell.c \ popen_noshell.c \
popen_noshell.h popen_noshell.h
libpopen_noshell_la_LDFLAGS = \
-z now