(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.228.2.4 and 1.229

version 1.228.2.4, 2010/05/21 08:56:21 version 1.229, 2009/01/21 01:37:17
Line 427 
Line 427 
  
 #endif /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION */ #endif /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION */
  
 static void _initConfigProperty(const String &propName, Uint32 value)  
 {  
     char strValue[22];  
     Uint32 n;  
     const char *startP = Uint32ToString(  
         strValue,  
         value,  
         n);  
     ConfigManager::getInstance()->initCurrentValue(propName, String(startP, n));  
 }  
   
 ///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
 //  MAIN //  MAIN
 ////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
Line 1045 
Line 1034 
                 //                 //
                 portNumberHttp = System::lookupPort(                 portNumberHttp = System::lookupPort(
                     WBEM_HTTP_SERVICE_NAME, WBEM_DEFAULT_HTTP_PORT);                     WBEM_HTTP_SERVICE_NAME, WBEM_DEFAULT_HTTP_PORT);
                 _initConfigProperty("httpPort", portNumberHttp);  
             }             }
             else             else
             {             {
Line 1099 
Line 1087 
                 //                 //
                 portNumberHttps = System::lookupPort(                 portNumberHttps = System::lookupPort(
                     WBEM_HTTPS_SERVICE_NAME, WBEM_DEFAULT_HTTPS_PORT);                     WBEM_HTTPS_SERVICE_NAME, WBEM_DEFAULT_HTTPS_PORT);
                 _initConfigProperty("httpsPort", portNumberHttps);  
             }             }
             else             else
             {             {
Line 1201 
Line 1188 
             parms);             parms);
         cerr << MessageLoader::getMessage(parms) << endl;         cerr << MessageLoader::getMessage(parms) << endl;
  
         deleteCIMServer();  
   
         //         //
         // notify parent process (if there is a parent process) to terminate         // notify parent process (if there is a parent process) to terminate
         //         //
         if (daemonOption)         if (daemonOption)
             _cimServerProcess->notify_parent(1);             _cimServerProcess->notify_parent(1);
  
           deleteCIMServer();
         return 1;         return 1;
     }     }
  
Line 1232 
Line 1218 
 #ifdef PEGASUS_ENABLE_SLP #ifdef PEGASUS_ENABLE_SLP
         _cimServer->startSLPProvider();         _cimServer->startSLPProvider();
 #endif #endif
         _cimServer->initComplete();  
   
         //         //
         // Loop to call CIMServer's runForever() method until CIMServer         // Loop to call CIMServer's runForever() method until CIMServer
         // has been shutdown         // has been shutdown


Legend:
Removed from v.1.228.2.4  
changed lines
  Added in v.1.229

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2