(file) Return to main.c CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Executor

Diff for /pegasus/src/Executor/main.c between version 1.5 and 1.6

version 1.5, 2007/06/13 21:23:56 version 1.6, 2007/06/15 17:40:06
Line 247 
Line 247 
  
     if (DefineConfigPathMacro("crlStore", "crl") != 0)     if (DefineConfigPathMacro("crlStore", "crl") != 0)
         Fatal(FL, "missing \"crlStore\" configuration parameter.");         Fatal(FL, "missing \"crlStore\" configuration parameter.");
   
     /* Define ${privilegedUser} */  
   
     DefineMacro("privilegedUser", "root");  
   
     /* Define ${cimserverUser} */  
   
     DefineMacro("cimserverUser", PEGASUS_CIMSERVERMAIN_USER);  
 } }
  
 /* /*
Line 270 
Line 262 
     const char* cimservermainPath;     const char* cimservermainPath;
     int pair[2];     int pair[2];
     char username[EXECUTOR_BUFFER_SIZE];     char username[EXECUTOR_BUFFER_SIZE];
       const char* childUserName;
       int childUid;
       int childGid;
     int childPid;     int childPid;
     struct Options options;     struct Options options;
  
Line 282 
Line 277 
     globals.argc = argc;     globals.argc = argc;
     globals.argv = argv;     globals.argv = argv;
  
       /* Open the log. */
   
       OpenLog("cimserver");
   
     /* Define macros needed by the executor. */     /* Define macros needed by the executor. */
  
     DefineExecutorMacros();     DefineExecutorMacros();
  
     /* If shuting down, then run CIMSHUTDOWN client. */      /* If shutting down, then run CIMSHUTDOWN client. */
  
     if (options.shutdown)     if (options.shutdown)
         ExecShutdown();         ExecShutdown();
Line 345 
Line 344 
  
     InitLogLevel();     InitLogLevel();
  
     /* Open the log. */  
   
     OpenLog("cimserver");  
   
     Log(LL_INFORMATION, "starting");     Log(LL_INFORMATION, "starting");
  
     /* Be sure this process is running as root (otherwise fail). */     /* Be sure this process is running as root (otherwise fail). */
Line 373 
Line 368 
  
     /* Determine user for running CIMSERVERMAIN. */     /* Determine user for running CIMSERVERMAIN. */
  
     GetServerUser(&globals.childUserName, &globals.childUid, &globals.childGid);      GetServerUser(&childUserName, &childUid, &childGid);
  
     /* Fork child process. */     /* Fork child process. */
  
Line 387 
Line 382 
             argc,             argc,
             argv,             argv,
             cimservermainPath,             cimservermainPath,
             globals.childUserName,              childUserName,
             globals.childUid,              childUid,
             globals.childGid,              childGid,
             pair[0]);             pair[0]);
     }     }
     else if (childPid > 0)     else if (childPid > 0)

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2