(file) Return to ServerProcessOS400.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Service / Attic

Diff for /pegasus/src/Service/Attic/ServerProcessOS400.cpp between version 1.1 and 1.3

version 1.1, 2005/03/03 03:01:26 version 1.3, 2005/04/17 16:00:04
Line 42 
Line 42 
 #include <sys/stat.h> #include <sys/stat.h>
 #include <fcntl.h> #include <fcntl.h>
 #include <unistd.h> #include <unistd.h>
   #include <sys/wait.h>
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/String.h> #include <Pegasus/Common/String.h>
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
   #include <Pegasus/Config/ConfigManager.h>
 #include "OS400ConvertChar.h" #include "OS400ConvertChar.h"
   #include "SSLWrapperOS400.h"
   #include "OS400SystemState.h"
 #include <Pegasus/Common/MessageLoader.h> //l10n #include <Pegasus/Common/MessageLoader.h> //l10n
 #include <except.h> #include <except.h>
  
Line 87 
Line 91 
 void ServerProcess::notify_parent(int id) {} void ServerProcess::notify_parent(int id) {}
 void ServerProcess::cimserver_set_process(void* p) {} void ServerProcess::cimserver_set_process(void* p) {}
 long ServerProcess::get_server_pid(void) { return 0; } long ServerProcess::get_server_pid(void) { return 0; }
   void ServerProcess::set_parent_pid(int pid) {}
 int ServerProcess::get_proc(int pid) { return 0; } int ServerProcess::get_proc(int pid) { return 0; }
 int ServerProcess::cimserver_wait(void) { return 1; } int ServerProcess::cimserver_wait(void) { return 1; }
 String ServerProcess::getHome(void) { return String::EMPTY; } String ServerProcess::getHome(void) { return String::EMPTY; }
Line 225 
Line 230 
    // Set the SQL server mode to true.    // Set the SQL server mode to true.
    // This will allow multiple connections to the same data source.    // This will allow multiple connections to the same data source.
    SQLSetEnvAttr(henv,SQL_ATTR_SERVER_MODE, &attr,0);    SQLSetEnvAttr(henv,SQL_ATTR_SERVER_MODE, &attr,0);
   
      //--------------------------------------------------
      // Create server SSL certificate and private key
      // if they do not already exist.
      //--------------------------------------------------
   
      // Check if SSL is enabled on either the wbem-https or
      // wbem-exp-https ports.
      ConfigManager * configManager = ConfigManager::getInstance();
      Boolean enableHttpsConnection = String::equal(
           configManager->getCurrentValue("enableHttpsConnection"), "true");
      Boolean enableSSLExportClientVerification = String::equal(
           configManager->getCurrentValue("enableSSLExportClientVerification"), "true");
      if (enableHttpsConnection || enableSSLExportClientVerification)
      {
          // Initialize the OS400 OpenSSL wrapper.
          // This checks if the OpenSSL LPO is installed.
          // It also activates the OpenSSL *SRVPGM and gets exports.
          SSL_OS400_Init();
   
          // Create the certificate if needed
          // Get the location of the certificate
          String certPath;
          certPath = ConfigManager::getHomedPath(
               configManager->getCurrentValue("sslCertificateFilePath"));
   
          // Get the location of the private key
          String keyPath;
          keyPath = ConfigManager::getHomedPath(
               configManager->getCurrentValue("sslKeyFilePath"));
   
          SSL_CreateCert_OS400(keyPath, certPath);
      }
     }
     catch (Exception & e)
     {
         //l10n
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                     e.getMessage());
         return(-1);
  }  }
   catch (...)   catch (...)
   {   {


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2