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.237 and 1.237.2.2

version 1.237, 2010/06/07 11:16:36

version 1.237.2.2, 2012/02/15 17:47:26

Line 132

//Windows service variables are not defined elsewhere in the product

//enable ability to override these

#ifndef PEGASUS_FLAVOR

#ifndef PEGASUS_SERVICE_NAME

#define PEGASUS_SERVICE_NAME "Pegasus CIM Object Manager";

#endif

#ifndef PEGASUS_SERVICE_DESCRIPTION

#define PEGASUS_SERVICE_DESCRIPTION "Pegasus CIM Object Manager Service";

#endif

#else

#ifndef PEGASUS_SERVICE_NAME

#define PEGASUS_SERVICE_NAME PEGASUS_FLAVOR " Pegasus CIM Object Manager"

#endif

#ifndef PEGASUS_SERVICE_DESCRIPTION

#define PEGASUS_SERVICE_DESCRIPTION PEGASUS_FLAVOR \

" Pegasus CIM Object Manager Service";

#endif

#ifdef PEGASUS_OS_PASE

#include <as400_protos.h> //for _SETCCSID

Line 343

Line 353

Thread::clearLanguages();

delete dummyInitialThread;

}

_serverRunStatus.setServerNotRunning();

}

Line 834

Line 845

if (shutdownOption)

{

#if defined(PEGASUS_OS_ZOS) && defined(PEGASUS_ZOS_SECURITY)

// This checks whether user is authorized to stop the

// CIM Server. When unauthorized a message is logged to

// to the user and program exits.

shutdownCheckProfileCIMSERVclassWBEM();

// Depending on the success of the previous check we may not

// reach this code!!!

#endif

String configTimeout =

configManager->getCurrentValue("shutdownTimeout");

Uint32 timeoutValue =

Legend:

Removed from v.1.237
changed lines
	Added in v.1.237.2.2

No CVS admin address has been configured