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.242 and 1.242.2.1

version 1.242, 2012/07/03 15:23:16

version 1.242.2.1, 2012/12/10 13:52:17

Line 1087

{

Uint32 portNumberHttp = 0;

String httpPort = configManager->getCurrentValue("httpPort");

if (httpPort == String::EMPTY)

if (httpPort.size() == 0)

{

// Look up the WBEM-HTTP port number

Line 1098

}

else

{

Uint64 longNumber;

// user-specified

// use the current value which has been checked for validity at

// load(fct. GetOptions), see DefaultPropertyOwner::isValid()

CString portString = httpPort.getCString();

StringConversion::decimalStringToUint64(

char* end = 0;

httpPort.getCString(),

portNumberHttp = strtol(portString, &end, 10);

longNumber);

if (!(end != 0 && *end == '\0'))

portNumberHttp = longNumber & 0xffff;

{

throw InvalidPropertyValue("httpPort", httpPort);

}

String listenOn = configManager->getCurrentValue("listenAddress");

Line 1151

Line 1148

{

Uint32 portNumberHttps = 0;

String httpsPort = configManager->getCurrentValue("httpsPort");

if (httpsPort == String::EMPTY)

if (httpsPort.size() == 0)

{

// Look up the WBEM-HTTPS port number

Line 1162

Line 1159

}

else

{

Uint64 longNumber;

// user-specified

// use the current value which has been checked for validity at

// load(fct. GetOptions), see DefaultPropertyOwner::isValid()

CString portString = httpsPort.getCString();

StringConversion::decimalStringToUint64(

char* end = 0;

httpsPort.getCString(),

portNumberHttps = strtol(portString, &end, 10);

longNumber);

if (!(end != 0 && *end == '\0'))

portNumberHttps = longNumber & 0xffff;

{

throw InvalidPropertyValue("httpsPort", httpsPort);

}

String listenOn = configManager->getCurrentValue("listenAddress");

if(String::equalNoCase(listenOn, "All"))

{

Legend:

Removed from v.1.242
changed lines
	Added in v.1.242.2.1

No CVS admin address has been configured