(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.1.2.10 and 1.1.2.11

version 1.1.2.10, 2007/01/11 21:36:06 version 1.1.2.11, 2007/01/12 01:42:12
Line 45 
Line 45 
 #include "Globals.h" #include "Globals.h"
 #include "Socket.h" #include "Socket.h"
 #include "Strlcpy.h" #include "Strlcpy.h"
   #include "Strlcat.h"
 #include "Log.h" #include "Log.h"
 #include "Policy.h" #include "Policy.h"
 #include "Macro.h" #include "Macro.h"
Line 296 
Line 297 
  
     if (DefineConfigPathMacro("crlStore", "crl") != 0)     if (DefineConfigPathMacro("crlStore", "crl") != 0)
         Fatal(FL, "missing \"crlStore\" configuration parameter.");         Fatal(FL, "missing \"crlStore\" configuration parameter.");
   
       /* Define ${policyConfigFilePath} */
       {
           char path1[EXECUTOR_BUFFER_SIZE];
           char path2[EXECUTOR_BUFFER_SIZE];
   
           ExpandMacros("${currentConfigFilePath}", path1);
           DirName(path1, path2);
           Strlcat(path2, "/cimserver_policy.conf", sizeof(path2));
   
           DefineMacro("policyConfigFilePath", path2);
       }
 } }
  
 /* /*
Line 333 
Line 346 
     if (options.shutdown)     if (options.shutdown)
         ExecShutdown();         ExecShutdown();
  
       /* Load the dynamic policy file. */
   
       LoadDynamicPolicy();
   
     /* Process --policy and --macros options. */     /* Process --policy and --macros options. */
  
     if (options.policy || options.macros)     if (options.policy || options.macros)


Legend:
Removed from v.1.1.2.10  
changed lines
  Added in v.1.1.2.11

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2