pegasus/src/Server/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.186 and 1.187

version 1.186, 2006/08/04 19:06:02

version 1.187, 2006/08/08 17:47:15

Line 943

if (os400StartupOption == false)

{

enableHttpConnection = String::equal(

enableHttpConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpConnection"), "true");

configManager->getCurrentValue("enableHttpConnection"));

enableHttpsConnection = String::equal(

enableHttpsConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpsConnection"), "true");

configManager->getCurrentValue("enableHttpsConnection"));

enableSSLExportClientVerification = String::equal(

enableSSLExportClientVerification = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableSSLExportClientVerification"), "true");

configManager->getCurrentValue("enableSSLExportClientVerification"));

}

#else

Boolean enableHttpConnection = String::equal(

Boolean enableHttpConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpConnection"), "true");

configManager->getCurrentValue("enableHttpConnection"));

Boolean enableHttpsConnection = String::equal(

Boolean enableHttpsConnection = ConfigManager::parseBooleanValue(

configManager->getCurrentValue("enableHttpsConnection"), "true");

configManager->getCurrentValue("enableHttpsConnection"));

Boolean enableSSLExportClientVerification = String::equal(

Boolean enableSSLExportClientVerification =

configManager->getCurrentValue("enableSSLExportClientVerification"), "true");

ConfigManager::parseBooleanValue(configManager->getCurrentValue(

"enableSSLExportClientVerification"));

#endif

// Make sure at least one connection is enabled

Line 982

Line 983

try

{

// Check to see if we should Pegasus as a daemon

// Check to see if we should start Pegasus as a daemon

if (String::equal(configManager->getCurrentValue("daemon"), "true"))

daemonOption = ConfigManager::parseBooleanValue(

{

configManager->getCurrentValue("daemon"));

daemonOption = true;

}

#ifdef PEGASUS_OS_OS400

if (os400StartupOption == false)

Legend:

Removed from v.1.186
changed lines
	Added in v.1.187

No CVS admin address has been configured