[icinga-checkins] icinga.org: icinga2/master: Windows build fix

git at icinga.org git at icinga.org
Tue Aug 9 15:41:32 CEST 2016


Module: icinga2
Branch: master
Commit: 43c2ec31ef12ac5491efade3c61bb9aeafec3c9b
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=43c2ec31ef12ac5491efade3c61bb9aeafec3c9b

Author: Gunnar Beutner <gunnar at beutner.name>
Date:   Tue Aug  9 15:41:27 2016 +0200

Windows build fix

fixes #12339

---

 lib/remote/apilistener.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 424c630..5103235 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -1190,12 +1190,12 @@ void ApiListener::ValidateTlsProtocolmin(const String& value, const ValidationUt
 	    value != SSL_TXT_TLSV1_2
 #endif /* SSL_TXT_TLSV1_1 */
 	    ) {
-		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("tls_protocolmin"), "Invalid TLS version. "
-		    "Must be one of '" SSL_TXT_TLSV1 "'"
+		String message = "Invalid TLS version. Must be one of '" SSL_TXT_TLSV1 "'";
 #ifdef SSL_TXT_TLSV1_1
-		    ", '" SSL_TXT_TLSV1_1 "' or '" SSL_TXT_TLSV1_2 "'"
+		message += ", '" SSL_TXT_TLSV1_1 "' or '" SSL_TXT_TLSV1_2 "'";
 #endif /* SSL_TXT_TLSV1_1 */
-		    ));
+
+		BOOST_THROW_EXCEPTION(ValidationError(this, boost::assign::list_of("tls_protocolmin"), message));
 	}
 }
 



More information about the icinga-checkins mailing list