From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 21 Jun 2012 14:16:53 +0000 (+0200)
Subject: Even more bugfixes.
X-Git-Tag: v0.0.1~381
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4fb11d4279327a8e31d6cb01da61c43f7f9f9fb;p=icinga2

Even more bugfixes.
---

diff --git a/README b/README
index c15b481dd..983b43c2a 100644
--- a/README
+++ b/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
 ---------------
diff --git a/base/tlsclient.cpp b/base/tlsclient.cpp
index 28c2415f1..229e13d2e 100644
--- a/base/tlsclient.cpp
+++ b/base/tlsclient.cpp
@@ -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;
 		}
 	}
diff --git a/components/checker/checkercomponent.h b/components/checker/checkercomponent.h
index 630f23fb5..a567950b7 100644
--- a/components/checker/checkercomponent.h
+++ b/components/checker/checkercomponent.h
@@ -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);
 };
 
diff --git a/configure.ac b/configure.ac
index 34e431f3a..0da80ac31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/third-party/popen-noshell/Makefile.am b/third-party/popen-noshell/Makefile.am
index f73162a44..f5fe59497 100644
--- a/third-party/popen-noshell/Makefile.am
+++ b/third-party/popen-noshell/Makefile.am
@@ -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