(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.191.2.8 and 1.191.2.9

version 1.191.2.8, 2006/12/31 05:30:08 version 1.191.2.9, 2007/01/02 06:14:48
Line 124 
Line 124 
 #endif #endif
  
 #ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION #ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
 # include <Pegasus/ExecutorClient/ExecutorClient.h>  # include <Pegasus/Common/Executor.h>
 # include <Executor/Executor.h> # include <Executor/Executor.h>
 # define PEGASUS_PROCESS_NAME "cimservermain" # define PEGASUS_PROCESS_NAME "cimservermain"
 #else #else
Line 683 
Line 683 
  
     // If invoked with "-x <socket>" option, then use executor client.     // If invoked with "-x <socket>" option, then use executor client.
  
     ExecutorClient::setExecutorSocket(_extractExecutorSocket(argc, argv));      Executor::setExecutorSocket(_extractExecutorSocket(argc, argv));
  
     // Ping executor to be sure the sock was valid.     // Ping executor to be sure the sock was valid.
  
     if (ExecutorClient::ping() != 0)      if (Executor::ping() != 0)
     {     {
         fprintf(stderr,         fprintf(stderr,
             "%s: failed to ping executor on socket given by -x option\n",             "%s: failed to ping executor on socket given by -x option\n",
Line 1451 
Line 1451 
         // so user knows that there is cimserver ready to serve CIM requests.         // so user knows that there is cimserver ready to serve CIM requests.
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
     if (daemonOption)     if (daemonOption)
         ExecutorClient::daemonizeExecutor();          Executor::daemonizeExecutor();
 #else #else
     if (daemonOption)     if (daemonOption)
         _cimServerProcess->notify_parent(0);         _cimServerProcess->notify_parent(0);


Legend:
Removed from v.1.191.2.8  
changed lines
  Added in v.1.191.2.9

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2