pegasus/src/Pegasus/Common/Executor.cpp - diff

Return to Executor.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Executor.cpp between version 1.20 and 1.26

version 1.20, 2008/08/28 17:24:36

version 1.26, 2012/12/13 14:38:55

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a

// copy of this software and associated documentation files (the "Software"),

// EMC Corporation; Symantec Corporation; The Open Group.

// to deal in the Software without restriction, including without limitation

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// Permission is hereby granted, free of charge, to any person obtaining a copy

// and/or sell copies of the Software, and to permit persons to whom the

// of this software and associated documentation files (the "Software"), to

// Software is furnished to do so, subject to the following conditions:

// deal in the Software without restriction, including without limitation the

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// The above copyright notice and this permission notice shall be included

// sell copies of the Software, and to permit persons to whom the Software is

// in all copies or substantial portions of the Software.

// furnished to do so, subject to the following conditions:

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

//////////////////////////////////////////////////////////////////////////

//%/////////////////////////////////////////////////////////////////////////////

Line 113

Line 111

const char* path) = 0;

virtual int startProviderAgent(

unsigned short bitness,

const char* module,

const String& pegasusHome,

const String& userName,

Line 219

Line 218

virtual int startProviderAgent(

unsigned short bitness,

const char* module,

const String& pegasusHome,

const String& userName,

Line 233

// Resolve full path of "cimprovagt" program.

String path = FileSystem::getAbsolutePath(

pegasusHome.getCString(), PEGASUS_PROVIDER_AGENT_PROC_NAME);

pegasusHome.getCString(),

bitness == PG_PROVMODULE_BITNESS_32 ?

PEGASUS_PROVIDER_AGENT32_PROC_NAME :

PEGASUS_PROVIDER_AGENT_PROC_NAME);

// Create CString handles for cimprovagt arguments

CString agentProgramPath = path.getCString();

CString userNameCString = userName.getCString();

# if defined(PEGASUS_DISABLE_PROV_USERCTXT)

# if defined(PEGASUS_DISABLE_PROV_USERCTXT) || defined(PEGASUS_OS_ZOS)

const char* setUserContextFlag = "0"; // False

# else

const char* setUserContextFlag = "1"; // True

Line 528

Line 531

return -1;

}

virtual int reapProviderAgent(

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

int pid)

virtual int reapProviderAgent(int)

{

#if !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

// Out-of-Process providers are never started by the cimserver process

// when Privilege Separation is enabled.

int status = 0;

return -1;

}

#else /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION is NOT defined */

# if defined(PEGASUS_HAS_SIGNALS)

# if defined(PEGASUS_DISABLE_PROV_USERCTXT) || defined(PEGASUS_OS_ZOS)

virtual int reapProviderAgent(int pid)

{

int status = 0;

// When provider user context is enabled, this is done in

// startProviderAgent().

while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)

;

{

};

return status;

}

# else

virtual int reapProviderAgent(int)

{

return 0;

}

# endif

return status;

#else /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION is defined */

// Out-of-Process providers are never started by the cimserver process

// when Privilege Separation is enabled.

return -1;

#endif

}

#if defined(PEGASUS_PAM_AUTHENTICATION)

virtual int authenticatePassword(

const char* username,

const char* password)

{

#if defined(PEGASUS_PAM_AUTHENTICATION)

return PAMAuthenticate(username, password);

#else

// ATTN: not handled so don't call in this case.

return -1;

#endif

}

virtual int validateUser(

const char* username)

{

#if defined(PEGASUS_PAM_AUTHENTICATION)

return PAMValidateUser(username);

}

#else

virtual int authenticatePassword(

const char*,

const char*)

{

// ATTN: not handled so don't call in this case.

return -1;

}

virtual int validateUser(

const char*)

{

// ATTN: not handled so don't call in this case.

return -1;

#endif

}

#endif

virtual int challengeLocal(

const char* username,

const char*,

char challengeFilePath[EXECUTOR_BUFFER_SIZE])

char[EXECUTOR_BUFFER_SIZE])

{

// ATTN: not handled so don't call in this case.

return -1;

}

virtual int authenticateLocal(

const char* challengeFilePath,

const char*,

const char* response)

const char*)

{

// ATTN: not handled so don't call in this case.

return -1;

}

virtual int updateLogLevel(

const char* logLevel)

const char*)

{

// If Privilege Separation is not enabled, we don't need to update

// the log level in the Executor.

Line 781

Line 794

}

virtual int startProviderAgent(

unsigned short bitness,

const char* module,

const String& pegasusHome,

const String& userName,

Line 820

Line 834

memset(&request, 0, sizeof(request));

memcpy(request.module, module, moduleNameLength);

memcpy(request.userName, userNameCString, userNameLength);

request.moduleBitness = bitness;

if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))

return -1;

Line 1140

Line 1155

}

int Executor::startProviderAgent(

unsigned short bitness,

const char* module,

const String& pegasusHome,

const String& userName,

Line 1148

Line 1164

AnonymousPipe*& writePipe)

{

once(&_executorImplOnce, _initExecutorImpl);

return _executorImpl->startProviderAgent(

return _executorImpl->startProviderAgent(bitness,

module, pegasusHome, userName, pid, readPipe, writePipe);

}

Legend:

Removed from v.1.20
changed lines
	Added in v.1.26

No CVS admin address has been configured