pegasus/src/Executor/main.c - diff

Return to main.c CVS log

Up to [Pegasus] / pegasus / src / Executor

Diff for /pegasus/src/Executor/main.c between version 1.1.2.8 and 1.1.2.9

version 1.1.2.8, 2007/01/11 16:01:23

version 1.1.2.9, 2007/01/11 20:48:24

Line 48

#include "Log.h"

#include "Policy.h"

#include "Macro.h"

#include "Assert.h"

**==============================================================================

** GetServerUser

** Determine which user to run cimservermain as.

** Determine which user to run CIMSERVERMAIN as.

** Note: this algorithm is no longer in use.

Line 68

Line 69

if (GetUserInfo(username, uid, gid) != 0)

{

Fatal(FL,

"The cimservermain user does not exist: \"%s\". Please create "

"The %s user does not exist: \"%s\". Please create "

"a system user with that name or use an OpenPegasus build that "

"disables privilege separation.", username);

"disables privilege separation.", CIMSERVERMAIN, username);

}

return -1;

Line 134

Line 135

**==============================================================================

void ExecShutdown(int argc, char** argv)

void ExecShutdown()

{

char* tmpArgv[3];

char cimshutdownPath[EXECUTOR_BUFFER_SIZE];

const char* cimshutdownPath;

char shutdownTimeout[EXECUTOR_BUFFER_SIZE];

const char* shutdownTimeout;

/* Get shutdownTimeout configuration parameter. */

if (GetConfigParam(argc, argv, "shutdownTimeout", shutdownTimeout) != 0)

if ((shutdownTimeout = FindMacro("shutdownTimeout")) == NULL)

Strlcpy(shutdownTimeout, "5", sizeof(shutdownTimeout));

Fatal(FL, "failed to resolve shutdownTimeout");

/* Get absolute cimshutdown program name. */

/* Get absolute CIMSHUTDOWN program name. */

if (GetInternalPegasusProgramPath(CIMSHUTDOWN, cimshutdownPath) != 0)

if ((cimshutdownPath = FindMacro("cimshutdownPath")) == NULL)

Fatal(FL, "Failed to locate Pegasus program: %s", CIMSHUTDOWN);

Fatal(FL, "failed to resolve cimshutdownPath");

/* Create argument list. */

tmpArgv[0] = CIMSHUTDOWN;

tmpArgv[1] = shutdownTimeout;

tmpArgv[1] = (char*)shutdownTimeout;

tmpArgv[2] = 0;

/* Exec CIMSHUTDOWN program. */

Line 185

Line 186

DefineMacro("internalBinDir", path);

}

/* Define ${cimservermain} */

DefineMacro("cimservermain", CIMSERVERMAIN);

/* Define ${cimprovagt} */

DefineMacro("cimprovagt", CIMPROVAGT);

/* Define ${cimshutdown} */

DefineMacro("cimshutdown", CIMSHUTDOWN);

/* Define ${cimservera} */

DefineMacro("cimservera", CIMSERVERA);

/* Define ${cimservermainPath} */

{

char path[EXECUTOR_BUFFER_SIZE];

if (ExpandMacros("${internalBinDir}/cimservermain", path) != 0)

if (ExpandMacros("${internalBinDir}/${cimservermain}", path) != 0)

Fatal(FL, "failed to resolve cimserver main path");

Fatal(FL, "failed to resolve cimservermainPath");

DefineMacro("cimservermainPath", path);

}

Line 199

Line 216

{

char path[EXECUTOR_BUFFER_SIZE];

if (ExpandMacros("${internalBinDir}/cimprovagt", path) != 0)

if (ExpandMacros("${internalBinDir}/${cimprovagt}", path) != 0)

Fatal(FL, "failed to resolve cimserver main path");

Fatal(FL, "failed to resolve cimprovagtPath");

DefineMacro("cimprovagtPath", path);

}

/* Define ${cimshutdownPath} */

{

char path[EXECUTOR_BUFFER_SIZE];

if (ExpandMacros("${internalBinDir}/${cimshutdown}", path) != 0)

Fatal(FL, "failed to resolve cimshutdownPath");

DefineMacro("cimshutdownPath", path);

}

/* Define ${cimserveraPath} */

{

char path[EXECUTOR_BUFFER_SIZE];

if (ExpandMacros("${internalBinDir}/cimservera", path) != 0)

if (ExpandMacros("${internalBinDir}/${cimservera}", path) != 0)

Fatal(FL, "failed to resolve cimserver main path");

Fatal(FL, "failed to resolve cimserveraPath");

DefineMacro("cimserveraPath", path);

}

/* Define ${shutdownTimeout} */

{

char buffer[EXECUTOR_BUFFER_SIZE];

if (GetConfigParam("shutdownTimeout", buffer) != 0)

Strlcpy(buffer, "5", sizeof(buffer));

DefineMacro("shutdownTimeout", buffer);

}

/* Define ${currentConfigFilePath} */

{

char path[EXECUTOR_BUFFER_SIZE];

Line 313

Line 351

int main(int argc, char** argv)

{

int i;

const char* cimservermainPath;

char cimservermainPath[EXECUTOR_BUFFER_SIZE];

int pair[2];

char username[EXECUTOR_BUFFER_SIZE];

int childPid;

int perror;

long shutdownTimeout;

const char* repositoryDir;

/* Save as global so it can be used in error and log messages. */

Line 327

Line 363

globals.argc = argc;

globals.argv = argv;

/* If shuting down, then run "cimshutdown" client. */

if (TestFlagOption(&argc, &argv, "-s", 0) == 0)

ExecShutdown(argc, argv);

/* Define macros needed by the executor. */

DefineExecutorMacros();

/* If shuting down, then run CIMSHUTDOWN client. */

if (TestFlagOption(&argc, &argv, "-s", 0) == 0)

ExecShutdown();

/* Check for --dump-policy option. */

if (TestFlagOption(&argc, &argv, "--dump-policy", 0) == 0)

Line 354

Line 390

exit(0);

}

/* Get absolute cimservermain program name. */

/* Get absolute CIMSERVERMAIN program name. */

if (GetInternalPegasusProgramPath(CIMSERVERMAIN, cimservermainPath) != 0)

if ((cimservermainPath = FindMacro("cimservermainPath")) == NULL)

Fatal(FL, "Failed to locate Pegasus program: %s", CIMSERVERMAIN);

Fatal(FL, "Failed to locate %s program", CIMSERVERMAIN);

/* If CIMSERVERMAIN is already running, warn and exit now. */

Line 376

Line 412

{

char buffer[EXECUTOR_BUFFER_SIZE];

if (GetConfigParam(argc, argv, "enableAuthentication", buffer) == 0 &&

if (GetConfigParam("enableAuthentication", buffer) == 0 &&

strcasecmp(buffer, "true") == 0)

{

globals.enableAuthentication = 1;

Line 432

Line 468

Log(LL_TRACE, "running as %s (uid=%d, gid=%d)",

username, (int)getuid(), (int)getgid());

/* Determine user for running cimservermain. */

/* Determine user for running CIMSERVERMAIN. */

GetServerUser(&globals.childUid, &globals.childGid);

Legend:

Removed from v.1.1.2.8
changed lines
	Added in v.1.1.2.9

No CVS admin address has been configured