Changeset 280

Timestamp:

08/11/10 11:17:30 (18 months ago)

Author:

mickem

Message:

parametrized certifaicte file (ish)

Location:

trunk

Files:

• build.cmake (modified) (1 diff)
• include/nrpe/server/server.cpp (modified) (1 diff)
• include/nrpe/server/server.hpp (modified) (1 diff)
• modules/NRPEServer/NRPEServer.cpp (modified) (1 diff)
• modules/NRPEServer/stdafx.h (modified) (1 diff)

trunk/build.cmake

@@ -24 +24 @@
 ELSE(WIN32)
 
+SET(INC_BOOST_INCLUDEDIR "/usr/include/")
+
 ENDIF(WIN32)
 

trunk/include/nrpe/server/server.cpp

@@ -38 +38 @@
       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");
+        request_handler_->log_debug(__FILEW__, __LINE__, _T("Using cert: ") + to_wstring(info.certificate));
+        context_.use_tmp_dh_file(info.certificate);
         context_.set_verify_mode(boost::asio::ssl::context::verify_none);
       }

trunk/include/nrpe/server/server.hpp

@@ -42 +42 @@
         bool use_ssl;
         boost::shared_ptr<nrpe::server::handler> request_handler;
-
+        std::string certificate;
         std::wstring get_endpoint_str() {
           return to_wstring(address) + _T(":") + to_wstring(port);

trunk/modules/NRPEServer/NRPEServer.cpp

@@ -78 +78 @@
   NSC_DEBUG_MSG_STD(_T("Allowed hosts: ") + allowedHosts.to_string());
   try {
+
+    boost::filesystem::wpath p = GET_CORE()->getBasePath() + std::wstring(_T("security/nrpe_dh_512.pem"));
+    info_.certificate = to_string(p.string());
+    if (boost::filesystem::is_regular(p)) {
+      NSC_LOG_ERROR_STD(_T("Certificate not found: ") + p.string());
+    }
     info_.port = to_string(SETTINGS_GET_INT(nrpe::PORT));
     info_.address = to_string(SETTINGS_GET_STRING(nrpe::BINDADDR));

trunk/modules/NRPEServer/stdafx.h

@@ -37 +37 @@
 #include <boost/tuple/tuple.hpp>
 
+#include <boost/filesystem.hpp>
+
 #ifdef USE_SSL
 #include <boost/asio/ssl.hpp>