Changeset 279

Timestamp:

08/11/10 10:15:50 (18 months ago)

Author:

mickem

Message:

Some fixes for unix build

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• include/nrpe/server/server.cpp (modified) (1 diff)
• include/service/unix_service.hpp (modified) (1 diff)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)
• modules/CheckExternalScripts/stdafx.h (modified) (1 diff)
• modules/NSCAAgent/NSCAAgent.cpp (modified) (1 diff)

trunk/CMakeLists.txt

@@ -26 +26 @@
 # ### ### ### ###
 # Boost setup
+IF(WIN32 AND MSVC)
 SET(Boost_USE_STATIC_LIBS CACHE BOOL ON "Link boost statically (generally a good idea)")
+ENDIF(WIN32 AND MSVC)
 SET(BOOST_INCLUDEDIR "${INC_BOOST_INCLUDEDIR}" CACHE PATH "Path to boost includes")
 SET(BOOST_LIBRARYDIR "${NSCP_LIBRARYDIR}" CACHE PATH "Path to boost libraries")

trunk/include/nrpe/server/server.cpp

@@ -36 +36 @@
         return;
       }
-      SSL_CTX_set_cipher_list(context_.impl(), "ADH");
-      request_handler_->log_debug(__FILEW__, __LINE__, _T("Using file: C:/source/nscp/build/security/nrpe_dh_512.pem"));
-      context_.use_tmp_dh_file("C:/source/nscp/build/security/nrpe_dh_512.pem");
-      context_.set_verify_mode(boost::asio::ssl::context::verify_none);
+      if (info.use_ssl) {
+        SSL_CTX_set_cipher_list(context_.impl(), "ADH");
+        request_handler_->log_debug(__FILEW__, __LINE__, _T("Using file: C:/source/nscp/build/security/nrpe_dh_512.pem"));
+        context_.use_tmp_dh_file("C:/source/nscp/build/security/nrpe_dh_512.pem");
+        context_.set_verify_mode(boost::asio::ssl::context::verify_none);
+      }
 
       new_connection_.reset(nrpe::server::factories::create(io_service_, context_, request_handler_, use_ssl_));

trunk/include/service/unix_service.hpp

@@ -26 +26 @@
 #include <string>
 #include <signal.h>
+#include <strEx.h>
 
 namespace service_helper_impl {

trunk/modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -22 +22 @@
 #include "CheckExternalScripts.h"
 #include <time.h>
+#include <string>
 
 #include <settings/macros.h>
@@ -131 +132 @@
       std::map<std::wstring,std::wstring>::const_iterator cit = wrappers.find(type);
       if (cit == wrappers.end()) {
-        NSC_LOG_ERROR_STD(_T("Failed to find wrappings for: ") + type + _T(" (" + (*it) + _T(")")));
+        NSC_LOG_ERROR_STD(_T("Failed to find wrappings for: ") + type + _T(" (") + (*it) + _T(")"));
       } else {
         addWrappedCommand((*it), (*cit).second, val);

trunk/modules/CheckExternalScripts/stdafx.h

@@ -27 +27 @@
 #include <boost/lexical_cast.hpp>
 
+#include <config.h>
+#include <unicode_char.hpp>
 #include <types.hpp>
 #include <NSCAPI.h>

trunk/modules/NSCAAgent/NSCAAgent.cpp

@@ -116 +116 @@
     boost::asio::io_service io_service;
     NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * message: ") + msg);
-    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * påerformance: ") + perf);
+    NSC_DEBUG_MSG_STD(_T("* * *NSCA * * * performance: ") + perf);
     nsca::socket socket(io_service);
     socket.connect(nscahost_, nscaport_);