(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.7 and 1.1.2.8

version 1.1.2.7, 2007/01/10 21:44:31 version 1.1.2.8, 2007/01/11 16:01:23
Line 47 
Line 47 
 #include "Strlcpy.h" #include "Strlcpy.h"
 #include "Log.h" #include "Log.h"
 #include "Policy.h" #include "Policy.h"
   #include "Macro.h"
  
 /* /*
 **============================================================================== **==============================================================================
Line 165 
Line 166 
 /* /*
 **============================================================================== **==============================================================================
 ** **
   ** DefineExecutorMacros()
   **
   **     Define macros used by the executor.
   **
   **==============================================================================
   */
   
   void DefineExecutorMacros()
   {
       /* Define ${internalBinDir} */
       {
           char path[EXECUTOR_BUFFER_SIZE];
   
           if (GetPegasusInternalBinDir(path) != 0)
               Fatal(FL, "failed to resolve internal pegasus bin directory");
   
           DefineMacro("internalBinDir", path);
       }
   
       /* Define ${cimservermainPath} */
       {
           char path[EXECUTOR_BUFFER_SIZE];
   
           if (ExpandMacros("${internalBinDir}/cimservermain", path) != 0)
               Fatal(FL, "failed to resolve cimserver main path");
   
           DefineMacro("cimservermainPath", path);
       }
   
       /* Define ${cimprovagtPath} */
       {
           char path[EXECUTOR_BUFFER_SIZE];
   
           if (ExpandMacros("${internalBinDir}/cimprovagt", path) != 0)
               Fatal(FL, "failed to resolve cimserver main path");
   
           DefineMacro("cimprovagtPath", path);
       }
   
       /* Define ${cimserveraPath} */
       {
           char path[EXECUTOR_BUFFER_SIZE];
   
           if (ExpandMacros("${internalBinDir}/cimservera", path) != 0)
               Fatal(FL, "failed to resolve cimserver main path");
   
           DefineMacro("cimserveraPath", path);
       }
   
       /* Define ${currentConfigFilePath} */
       {
           char path[EXECUTOR_BUFFER_SIZE];
   
           if (GetHomedPath(PEGASUS_CURRENT_CONFIG_FILE_PATH, path) != 0)
           {
               Fatal(FL, "GetHomedPath() failed on \"%s\"",
                   PEGASUS_CURRENT_CONFIG_FILE_PATH);
           }
   
           DefineMacro("currentConfigFilePath", path);
       }
   
       /* Define ${repositoryDir} */
   
       if (DefineConfigPathMacro("repositoryDir", PEGASUS_REPOSITORY_DIR) != 0)
           Fatal(FL, "missing \"repositoryDir\" configuration parameter.");
   
       /* Define ${passwordFilePath} */
   
       if (DefineConfigPathMacro("passwordFilePath", "cimserver.passwd") != 0)
           Fatal(FL, "missing \"passwordFilePath\" configuration parameter.");
   
       /* Define ${traceFilePath} */
   
       if (DefineConfigPathMacro("traceFilePath", NULL) != 0)
           Fatal(FL, "missing \"traceFilePath\" configuration parameter.");
   
       /* Define ${sslKeyFilePath} */
   
       if (DefineConfigPathMacro("sslKeyFilePath", "file.pem") != 0)
           Fatal(FL, "missing \"sslKeyFilePath\" configuration parameter.");
   
       /* Define ${sslTrustStore} */
   
       if (DefineConfigPathMacro("sslTrustStore", "cimserver_trust") != 0)
           Fatal(FL, "missing \"sslTrustStore\" configuration parameter.");
   
       /* Define ${crlStore} */
   
       if (DefineConfigPathMacro("crlStore", "crl") != 0)
           Fatal(FL, "missing \"crlStore\" configuration parameter.");
   }
   
   /*
   **==============================================================================
   **
   ** TestFlagOption()
   **
   **     Check whether argv contains the given option. Return 0 if so. Else
   **     return -1. Remove the argument from the list if the *remove* argument
   **     is non-zero.
   **
   **         if (TestFlagOption(&argc, &argv, "--help", 0) == 0)
   **         {
   **         }
   **
   **==============================================================================
   */
   
   int TestFlagOption(int* argc_, char*** argv_, const char* option, int remove)
   {
       int argc = *argc_;
       char** argv = *argv_;
       int i;
   
       for (i = 0; i < argc; i++)
       {
           if (strcmp(argv[i], option) == 0)
           {
               if (remove)
               {
                   memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));
                   argc--;
               }
   
               *argc_ = argc;
               *argv_ = argv;
               return 0;
           }
       }
   
       /* Not found */
       return -1;
   }
   
   /*
   **==============================================================================
   **
 ** main() ** main()
 ** **
 **============================================================================== **==============================================================================
Line 181 
Line 320 
     int childPid;     int childPid;
     int perror;     int perror;
     long shutdownTimeout;     long shutdownTimeout;
       const char* repositoryDir;
  
     /* Save as global so it can be used in error and log messages. */     /* Save as global so it can be used in error and log messages. */
  
     globals.arg0 = argv[0];      globals.argc = argc;
       globals.argv = argv;
  
     /* If shuting down, then run "cimshutdown" client. */     /* If shuting down, then run "cimshutdown" client. */
  
     for (i = 0; i < argc; i++)      if (TestFlagOption(&argc, &argv, "-s", 0) == 0)
     {  
         if (strcmp(argv[i], "-s") == 0)  
             ExecShutdown(argc, argv);             ExecShutdown(argc, argv);
   
       /* Define macros needed by the executor. */
   
       DefineExecutorMacros();
   
       /* Check for --dump-policy option. */
   
       if (TestFlagOption(&argc, &argv, "--dump-policy", 0) == 0)
       {
           DumpPolicy(1);
           putchar('\n');
           exit(0);
       }
   
       /* Check for --dump-macros option. */
   
       if (TestFlagOption(&argc, &argv, "--dump-macros", 0) == 0)
       {
           DumpMacros();
           putchar('\n');
           exit(0);
     }     }
  
     /* Get absolute cimservermain program name. */     /* Get absolute cimservermain program name. */
Line 206 
Line 366 
         fprintf(stderr,         fprintf(stderr,
             "%s: cimserver is already running (the PID found in the file "             "%s: cimserver is already running (the PID found in the file "
             "\"%s\" corresponds to an existing process named \"%s\").\n\n",             "\"%s\" corresponds to an existing process named \"%s\").\n\n",
             globals.arg0, PEGASUS_CIMSERVER_START_FILE, CIMSERVERMAIN);              globals.argv[0], PEGASUS_CIMSERVER_START_FILE, CIMSERVERMAIN);
  
         exit(1);         exit(1);
     }     }
Line 223 
Line 383 
         }         }
     }     }
  
     /* Locate password file. */  
   
     if (LocatePasswordFile(argc, argv, globals.passwordFilePath) != 0)  
         Fatal(FL, "Failed to locate password file");  
   
     /* Locate key file. */  
   
     if (LocateKeyFile(argc, argv, globals.sslKeyFilePath) != 0)  
         Fatal(FL, "Failed to locate key file");  
   
     /* Locate the path of directory to contain trace files. */  
   
     if (LocateTraceFilePath(argc, argv, globals.traceFilePath) != 0)  
         Fatal(FL, "Failed to locate trace file path");  
   
     /* Locate the sslTrustStore. */  
   
     if (LocateSslTrustStore(argc, argv, globals.sslTrustStore) != 0)  
         Fatal(FL, "Failed to locate SSL trust store");  
   
     /* Locate the crlStore . */  
   
     if (LocateCrlStore(argc, argv, globals.crlStore) != 0)  
         Fatal(FL, "Failed to locate crl store");  
   
     /* Define macros needed by policy facility. */  
   
     DefinePolicyMacros();  
   
     /* Create a socket pair for communicating with the child process. */     /* Create a socket pair for communicating with the child process. */
  
     if (CreateSocketPair(pair) != 0)     if (CreateSocketPair(pair) != 0)
Line 263 
Line 394 
  
     GetLogLevel(argc, argv);     GetLogLevel(argc, argv);
  
     /* Extract -p (perror) option. */      /* Extract --perror option (directs syslog output to stderr). */
  
     perror = 0;     perror = 0;
  
     for (i = 0; i < argc; i++)      if (TestFlagOption(&argc, &argv, "--perror", 1) == 0)
     {  
         if (strcmp(argv[i], "-p") == 0)  
         {  
             perror = 1;             perror = 1;
             memmove(&argv[i], &argv[i + 1], (argc-i) * sizeof(char*));  
             argc--;  
             break;  
         }  
     }  
  
     /* Open the log. */     /* Open the log. */
  
Line 289 
Line 412 
     if (setuid(0) != 0 || setgid(0) != 0)     if (setuid(0) != 0 || setgid(0) != 0)
     {     {
         Log(LL_FATAL, "attempted to run program as non-root user");         Log(LL_FATAL, "attempted to run program as non-root user");
         fprintf(stderr, "%s: this program must be run as root\n", globals.arg0);          fprintf(stderr,
               "%s: this program must be run as root\n", globals.argv[0]);
         exit(0);         exit(0);
     }     }
  
Line 312 
Line 436 
  
     GetServerUser(&globals.childUid, &globals.childGid);     GetServerUser(&globals.childUid, &globals.childGid);
  
       /* Get repositoryDir for child. */
   
       if ((repositoryDir = FindMacro("repositoryDir")) == NULL)
           Fatal(FL, "failed to find repositoryDir macro");
   
     /* Fork child process. */     /* Fork child process. */
  
     childPid = fork();     childPid = fork();
Line 320 
Line 449 
     {     {
         /* Child. */         /* Child. */
         close(pair[1]);         close(pair[1]);
         Child(argc, argv,          Child(argc, argv, cimservermainPath, globals.childUid,
             cimservermainPath, globals.childUid, globals.childGid, pair[0]);              globals.childGid, pair[0], repositoryDir);
     }     }
     else if (childPid > 0)     else if (childPid > 0)
     {     {

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