rpms/tog-pegasus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

apply upstream 2.5.2_APPROVED bug fixes; fix bug 193121

Browse Source
This commit is contained in:
jvdias 2006-05-31 19:06:15 +00:00
parent b3b3ea6b1b
commit 9e4e3351e4
10 changed files with 2839 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pegasus-2.5.1-obz5046.patch Normal file
View File

@ -0,0 +1,36 @@
--- pegasus/rpm/manLinux/man1.Z/cimprovider.1.obz5046 2004-12-08 04:40:38.000000000 -0500
+++ pegasus/rpm/manLinux/man1.Z/cimprovider.1 2006-05-31 13:43:51.000000000 -0400
@@ -146,11 +146,13 @@
Error
.PD
.RE
-.SH "USAGE NOTE"
+.SH "USAGE NOTES"
.PP
The
.B cimprovider
command requires that the CIM Server is running.
+If an operation requires more than two minutes to complete, the cimprovider
+command prints a timeout message and returns an error value.
.SH "EXAMPLES "
.PP
Disable provider module "OperatingSystemProvider" and
--- pegasus/src/Clients/cimprovider/CIMProviderCommand.cpp.obz5046 2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimprovider/CIMProviderCommand.cpp 2006-05-31 14:02:17.000000000 -0400
@@ -69,6 +69,8 @@
#include "OS400ConvertChar.h"
#endif
+#define CIMPROVIDERCOMMAND_CLIENT_DEFAULTTIMEOUT 120000
+
PEGASUS_USING_STD;
PEGASUS_NAMESPACE_BEGIN
@@ -1145,6 +1147,7 @@
// Construct the CIMClient and set to request server messages
// in the default language of this client process.
_client.reset(new CIMClient);//PEP101
+ _client->setTimeout(CIMPROVIDERCOMMAND_CLIENT_DEFAULTTIMEOUT);
_client->setRequestDefaultLanguages(); //l10n
}
catch (Exception & e)

21
pegasus-2.5.1-obz5047.patch Normal file
View File

@ -0,0 +1,21 @@
--- pegasus/src/Pegasus/Compiler/cimmofClient.h.obz5047 2006-01-30 11:17:33.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cimmofClient.h 2006-05-31 12:09:17.000000000 -0400
@@ -67,6 +67,8 @@
#include <Pegasus/Client/CIMClient.h>
#include <Pegasus/Compiler/Linkage.h>
+#define CIMMOFCLIENT_TIMEOUT_DEFAULT 120000
+
PEGASUS_NAMESPACE_BEGIN
// Forward declarations;
--- pegasus/src/Pegasus/Compiler/cimmofClient.cpp.obz5047 2006-01-30 11:17:33.000000000 -0500
+++ pegasus/src/Pegasus/Compiler/cimmofClient.cpp 2006-05-31 12:10:02.000000000 -0400
@@ -68,6 +68,7 @@
// our caller handle it.
_client = new CIMClient();
+ _client->setTimeout(CIMMOFCLIENT_TIMEOUT_DEFAULT);
_client->setRequestDefaultLanguages(); //l10n
#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) || defined(PEGASUS_OS_VMS)

25
pegasus-2.5.1-obz5048.patch Normal file
View File

@ -0,0 +1,25 @@
--- pegasus/src/Pegasus/Client/CIMOperationRequestEncoder.cpp.obz5048 2006-01-30 11:16:42.000000000 -0500
+++ pegasus/src/Pegasus/Client/CIMOperationRequestEncoder.cpp 2006-05-31 12:14:31.000000000 -0400
@@ -67,6 +67,7 @@
_authenticator(authenticator),
_showOutput(showOutput)
{
+ dataStore_prt = NULL;
}
CIMOperationRequestEncoder::~CIMOperationRequestEncoder()
@@ -881,9 +882,11 @@
Uint32 contentLength;
http_request->parse(startLine, headers, contentLength);
- dataStore_prt->setRequestSize(contentLength);
- dataStore_prt->setStartNetworkTime();
-
+ if ( dataStore_prt )
+ {
+ dataStore_prt->setRequestSize(contentLength);
+ dataStore_prt->setStartNetworkTime();
+ }
_outputQueue->enqueue(http_request);
}

32
pegasus-2.5.1-obz5049.patch Normal file
View File

@ -0,0 +1,32 @@
--- pegasus/src/Pegasus/Common/CIMStatusCode.h.obz5049 2006-02-17 14:30:37.000000000 -0500
+++ pegasus/src/Pegasus/Common/CIMStatusCode.h 2006-05-31 11:43:33.000000000 -0400
@@ -37,7 +37,6 @@
#include <Pegasus/Common/Config.h>
#include <Pegasus/Common/Linkage.h>
#include <Pegasus/Common/ContentLanguageList.h>
-#include <Pegasus/Common/MessageLoader.h>
PEGASUS_NAMESPACE_BEGIN
--- pegasus/src/Pegasus/Common/Exception.h.obz5049 2006-01-30 11:17:03.000000000 -0500
+++ pegasus/src/Pegasus/Common/Exception.h 2006-05-31 11:44:46.000000000 -0400
@@ -37,7 +37,9 @@
#include <Pegasus/Common/Config.h>
#include <Pegasus/Common/String.h>
#include <Pegasus/Common/CIMStatusCode.h>
+#ifdef PEGASUS_USE_EXPERIMENTAL_INTERFACES
#include <Pegasus/Common/MessageLoader.h>
+#endif
#include <Pegasus/Common/Linkage.h>
#include <Pegasus/Common/ContentLanguageList.h>
--- pegasus/src/Pegasus/Common/CIMStatusCode.cpp.obz5049 2006-01-30 11:16:47.000000000 -0500
+++ pegasus/src/Pegasus/Common/CIMStatusCode.cpp 2006-05-31 11:43:52.000000000 -0400
@@ -38,6 +38,7 @@
//%/////////////////////////////////////////////////////////////////////////////
#include "CIMStatusCode.h"
+#include <Pegasus/Common/MessageLoader.h>
PEGASUS_NAMESPACE_BEGIN

1664
pegasus-2.5.1-obz5051.patch Normal file
View File

File diff suppressed because it is too large Load Diff

240
pegasus-2.5.1-obz5053.patch Normal file
View File

@ -0,0 +1,240 @@
--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.obz5053 2006-05-31 14:05:14.000000000 -0400
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2006-05-31 14:05:14.000000000 -0400
@@ -1036,20 +1036,23 @@
// reserve space for entire non-chunked message
if (_contentLength > 0)
{
- try
- {
- Uint32 capacity = (Uint32)(_contentLength + _contentOffset + 1);
- _incomingBuffer.reserveCapacity(capacity);
- data = (char *)_incomingBuffer.getData();
- data[capacity-1] = 0;
- }catch(const PEGASUS_STD(bad_alloc)&)
- {
- _throwEventFailure(HTTP_STATUS_REQUEST_TOO_LARGE,
- "Error reserving space for non-chunked message");
- }catch(...)
- {
- _throwEventFailure(httpStatusInternal, "unexpected exception");
- }
+ try
+ {
+ Uint32 capacity = (Uint32)(_contentLength +
+ _contentOffset + 1);
+ _incomingBuffer.reserveCapacity(capacity);
+ data = (char *)_incomingBuffer.getData();
+ data[capacity-1] = 0;
+ }
+ catch(const PEGASUS_STD(bad_alloc)&)
+ {
+ _throwEventFailure(HTTP_STATUS_REQUEST_TOO_LARGE,
+ "Error reserving space for non-chunked message");
+ }
+ catch(...)
+ {
+ _throwEventFailure(httpStatusInternal, "unexpected exception");
+ }
}
break;
--- pegasus/src/Pegasus/Common/tests/Array/Array.cpp.obz5053 2006-01-30 11:17:15.000000000 -0500
+++ pegasus/src/Pegasus/Common/tests/Array/Array.cpp 2006-05-31 14:34:16.000000000 -0400
@@ -189,7 +189,7 @@
{
Array<Uint32> arr(0xffff0000);
}
- catch (const NullPointer&)
+ catch (const PEGASUS_STD(bad_alloc)&)
{
exceptionCaught = true;
}
@@ -201,7 +201,7 @@
{
Array<Uint32> arr(0xffff0000, 100);
}
- catch (const NullPointer&)
+ catch (const PEGASUS_STD(bad_alloc)&)
{
exceptionCaught = true;
}
@@ -214,7 +214,7 @@
Uint32 myInt = 50;
Array<Uint32> arr(&myInt, 0xffff0000);
}
- catch (const NullPointer&)
+ catch (const PEGASUS_STD(bad_alloc)&)
{
exceptionCaught = true;
}
@@ -224,7 +224,16 @@
{
Array<Uint32> arr(128);
PEGASUS_TEST_ASSERT(arr.getCapacity() == 128);
- arr.reserveCapacity(0xffff0000);
+ exceptionCaught = false;
+ try
+ {
+ arr.reserveCapacity(0xffff0000);
+ }
+ catch (const PEGASUS_STD(bad_alloc)&)
+ {
+ exceptionCaught = true;
+ }
+ PEGASUS_TEST_ASSERT(exceptionCaught);
PEGASUS_TEST_ASSERT(arr.getCapacity() == 128);
}
}
--- pegasus/src/Pegasus/Common/InternalException.h.obz5053 2006-01-30 11:17:04.000000000 -0500
+++ pegasus/src/Pegasus/Common/InternalException.h 2006-05-31 14:05:14.000000000 -0400
@@ -619,6 +619,18 @@
#define PEGASUS_CIM_EXCEPTION_L(CODE, MSG_PARMS) \
TraceableCIMException(CODE, MSG_PARMS, String(__FILE__), __LINE__)
+/** Macro to prevent overflow of a signed int value when said value is
+ * doubled. If String/Array/Buffer size is greater than 0x3FFFFFFF, then
+ * something is suspect, throw bad_alloc exception.
+ */
+#define PEGASUS_CHECK_CAPACITY_OVERFLOW(capacity) \
+ do \
+ { \
+ if (capacity > 0x3FFFFFFF) \
+ throw PEGASUS_STD(bad_alloc)(); \
+ } \
+ while (0)
+
PEGASUS_NAMESPACE_END
#endif /* Pegasus_InternalException_h */
--- pegasus/src/Pegasus/Common/ArrayRep.h.obz5053 2006-01-30 11:16:46.000000000 -0500
+++ pegasus/src/Pegasus/Common/ArrayRep.h 2006-05-31 14:05:14.000000000 -0400
@@ -145,9 +145,10 @@
}
// Test for Uint32 overflow in the memory allocation size
+ // throw a bad_alloc exception if overflow would occur.
if (initialCapacity > (Uint32(0xffffffff)-sizeof(ArrayRep<T>))/sizeof(T))
{
- return 0;
+ throw PEGASUS_STD(bad_alloc)();
}
// Create object:
--- pegasus/src/Pegasus/Common/ArrayImpl.h.obz5053 2006-01-30 11:16:45.000000000 -0500
+++ pegasus/src/Pegasus/Common/ArrayImpl.h 2006-05-31 14:05:14.000000000 -0400
@@ -77,10 +77,8 @@
{
_rep = ArrayRep<PEGASUS_ARRAY_T>::alloc(size);
- if (!_rep)
- {
- throw NullPointer();
- }
+ // ArrayRep<PEGASUS_ARRAY_T>::alloc() throws a bad_alloc exception if
+ // storage could not be obtained.
InitializeRaw(Array_data, size);
}
@@ -92,10 +90,8 @@
{
_rep = ArrayRep<PEGASUS_ARRAY_T>::alloc(size);
- if (!_rep)
- {
- throw NullPointer();
- }
+ // ArrayRep<PEGASUS_ARRAY_T>::alloc() throws a bad_alloc exception if
+ // storage could not be obtained.
PEGASUS_ARRAY_T* data = Array_data;
@@ -114,10 +110,8 @@
{
_rep = ArrayRep<PEGASUS_ARRAY_T>::alloc(size);
- if (!_rep)
- {
- throw NullPointer();
- }
+ // ArrayRep<PEGASUS_ARRAY_T>::alloc() throws a bad_alloc exception if
+ // storage could not be obtained.
CopyToRaw(Array_data, items, size);
}
@@ -176,8 +170,8 @@
ArrayRep<PEGASUS_ARRAY_T>* rep =
ArrayRep<PEGASUS_ARRAY_T>::alloc(capacity);
- if (!rep)
- return;
+ // ArrayRep<PEGASUS_ARRAY_T>::alloc() throws a bad_alloc exception if
+ // storage could not be obtained.
rep->size = Array_size;
--- pegasus/src/Pegasus/Common/Buffer.cpp.obz5053 2006-05-31 14:05:14.000000000 -0400
+++ pegasus/src/Pegasus/Common/Buffer.cpp 2006-05-31 14:05:14.000000000 -0400
@@ -43,16 +43,13 @@
static const size_t MIN_CAPACITY = 2048;
-#ifndef PEGASUS_CHECK_FOR_OVERFLOW
-#define PEGASUS_CHECK_FOR_OVERFLOW(capacity) { if (capacity > 0x3FFFFFFF) throw PEGASUS_STD(bad_alloc)(); }
-#endif
-
static Uint32 _next_pow_2(Uint32 x)
{
if (x < MIN_CAPACITY)
return MIN_CAPACITY;
- PEGASUS_CHECK_FOR_OVERFLOW(x);
+ // Check for potential overflow in x.
+ PEGASUS_CHECK_CAPACITY_OVERFLOW(x);
x--;
x |= (x >> 1);
@@ -139,7 +136,8 @@
}
else
{
- PEGASUS_CHECK_FOR_OVERFLOW(_rep->cap);
+ // Check for potential overflow.
+ PEGASUS_CHECK_CAPACITY_OVERFLOW(_rep->cap);
_rep = _reallocate(_rep, _rep->cap ? (2 * _rep->cap) : MIN_CAPACITY);
}
}
--- pegasus/src/Pegasus/Common/String.cpp.obz5053 2006-05-31 14:05:14.000000000 -0400
+++ pegasus/src/Pegasus/Common/String.cpp 2006-05-31 14:05:14.000000000 -0400
@@ -51,10 +51,6 @@
#include <unicode/uchar.h>
#endif
-#ifndef PEGASUS_CHECK_FOR_OVERFLOW
-#define PEGASUS_CHECK_FOR_OVERFLOW(capacity) { if (capacity > 0x3FFFFFFF) throw PEGASUS_STD(bad_alloc)(); }
-#endif
-
PEGASUS_NAMESPACE_BEGIN
//==============================================================================
@@ -170,7 +166,8 @@
{
#ifndef PEGASUS_STRING_NO_THROW
- PEGASUS_CHECK_FOR_OVERFLOW(x);
+ // Check for potential overflow in x
+ PEGASUS_CHECK_CAPACITY_OVERFLOW(x);
#endif
@@ -547,8 +544,9 @@
inline StringRep* StringRep::alloc(size_t cap)
{
#ifndef PEGASUS_STRING_NO_THROW
-
- PEGASUS_CHECK_FOR_OVERFLOW(cap);
+
+ // Check for potential overflow in cap
+ PEGASUS_CHECK_CAPACITY_OVERFLOW(cap);
#endif

11
pegasus-2.5.1-obz5059.patch Normal file
View File

@ -0,0 +1,11 @@
--- pegasus/src/Pegasus/Common/XmlWriter.cpp.obz5059 2006-01-30 11:17:08.000000000 -0500
+++ pegasus/src/Pegasus/Common/XmlWriter.cpp 2006-05-31 13:03:27.000000000 -0400
@@ -250,7 +250,7 @@
static const int _isSpecialChar7[] =
{
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,0,
- 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
};

58
pegasus-2.5.1-obz5072.patch Normal file
View File

@ -0,0 +1,58 @@
--- pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.cpp.obz5072 2006-05-31 12:18:40.000000000 -0400
+++ pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.cpp 2006-05-31 13:09:56.000000000 -0400
@@ -97,18 +97,25 @@
{
public:
OutstandingRequestEntry(
- String messageId_,
+ String originalMessageId_,
CIMRequestMessage* requestMessage_,
CIMResponseMessage*& responseMessage_,
Semaphore* responseReady_)
- : messageId(messageId_),
+ : originalMessageId(originalMessageId_),
requestMessage(requestMessage_),
responseMessage(responseMessage_),
responseReady(responseReady_)
{
}
- String messageId;
+ /**
+ A unique value is substituted as the request messageId attribute to
+ allow responses to be definitively correllated with requests.
+ The original messageId value is stored here to avoid a race condition
+ between the processing of a response chunk and the resetting of the
+ original messageId in the request message.
+ */
+ String originalMessageId;
CIMRequestMessage* requestMessage;
CIMResponseMessage*& responseMessage;
Semaphore* responseReady;
@@ -931,7 +938,7 @@
i != 0; i++)
{
PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL2,
- String("Completing messageId \"") + i.value()->messageId +
+ String("Completing messageId \"") + i.key() +
"\" with a null response.");
i.value()->responseMessage = response;
i.value()->responseReady->signal();
@@ -1048,7 +1055,7 @@
//
Semaphore waitSemaphore(0);
OutstandingRequestEntry outstandingRequestEntry(
- uniqueMessageId, request, response, &waitSemaphore);
+ originalMessageId, request, response, &waitSemaphore);
//
// Lock the Provider Agent Container while initializing the
@@ -1343,7 +1350,7 @@
// Put the original message ID into the response
response->messageId =
- _outstandingRequestEntry->requestMessage->messageId;
+ _outstandingRequestEntry->originalMessageId;
// Call the response chunk callback to process the chunk
_responseChunkCallback(

751
pegasus-2.5.1-obz5083.patch Normal file
View File

@ -0,0 +1,751 @@
--- pegasus/src/Pegasus/Common/CIMMessage.cpp.obz5083 2006-05-31 12:18:40.000000000 -0400
+++ pegasus/src/Pegasus/Common/CIMMessage.cpp 2006-05-31 13:13:35.000000000 -0400
@@ -46,7 +46,7 @@
PEGASUS_NAMESPACE_BEGIN
-void CIMResponseMessage::syncAttributes(CIMRequestMessage* request)
+void CIMResponseMessage::syncAttributes(const CIMRequestMessage* request)
{
// Propagate request attributes to the response, as necessary
setKey(request->getKey());
@@ -56,7 +56,7 @@
setCloseConnect(request->getCloseConnect());
}
-CIMResponseMessage* CIMGetClassRequestMessage::buildResponse()
+CIMResponseMessage* CIMGetClassRequestMessage::buildResponse() const
{
AutoPtr<CIMGetClassResponseMessage> response(
new CIMGetClassResponseMessage(
@@ -68,7 +68,7 @@
return response.release();
}
-CIMResponseMessage* CIMGetInstanceRequestMessage::buildResponse()
+CIMResponseMessage* CIMGetInstanceRequestMessage::buildResponse() const
{
AutoPtr<CIMGetInstanceResponseMessage> response(
new CIMGetInstanceResponseMessage(
@@ -80,7 +80,7 @@
return response.release();
}
-CIMResponseMessage* CIMExportIndicationRequestMessage::buildResponse()
+CIMResponseMessage* CIMExportIndicationRequestMessage::buildResponse() const
{
AutoPtr<CIMExportIndicationResponseMessage> response(
new CIMExportIndicationResponseMessage(
@@ -91,7 +91,7 @@
return response.release();
}
-CIMResponseMessage* CIMDeleteClassRequestMessage::buildResponse()
+CIMResponseMessage* CIMDeleteClassRequestMessage::buildResponse() const
{
AutoPtr<CIMDeleteClassResponseMessage> response(
new CIMDeleteClassResponseMessage(
@@ -102,7 +102,7 @@
return response.release();
}
-CIMResponseMessage* CIMDeleteInstanceRequestMessage::buildResponse()
+CIMResponseMessage* CIMDeleteInstanceRequestMessage::buildResponse() const
{
AutoPtr<CIMDeleteInstanceResponseMessage> response(
new CIMDeleteInstanceResponseMessage(
@@ -113,7 +113,7 @@
return response.release();
}
-CIMResponseMessage* CIMCreateClassRequestMessage::buildResponse()
+CIMResponseMessage* CIMCreateClassRequestMessage::buildResponse() const
{
AutoPtr<CIMCreateClassResponseMessage> response(
new CIMCreateClassResponseMessage(
@@ -124,7 +124,7 @@
return response.release();
}
-CIMResponseMessage* CIMCreateInstanceRequestMessage::buildResponse()
+CIMResponseMessage* CIMCreateInstanceRequestMessage::buildResponse() const
{
AutoPtr<CIMCreateInstanceResponseMessage> response(
new CIMCreateInstanceResponseMessage(
@@ -136,7 +136,7 @@
return response.release();
}
-CIMResponseMessage* CIMModifyClassRequestMessage::buildResponse()
+CIMResponseMessage* CIMModifyClassRequestMessage::buildResponse() const
{
AutoPtr<CIMModifyClassResponseMessage> response(
new CIMModifyClassResponseMessage(
@@ -147,7 +147,7 @@
return response.release();
}
-CIMResponseMessage* CIMModifyInstanceRequestMessage::buildResponse()
+CIMResponseMessage* CIMModifyInstanceRequestMessage::buildResponse() const
{
AutoPtr<CIMModifyInstanceResponseMessage> response(
new CIMModifyInstanceResponseMessage(
@@ -158,7 +158,7 @@
return response.release();
}
-CIMResponseMessage* CIMEnumerateClassesRequestMessage::buildResponse()
+CIMResponseMessage* CIMEnumerateClassesRequestMessage::buildResponse() const
{
AutoPtr<CIMEnumerateClassesResponseMessage> response(
new CIMEnumerateClassesResponseMessage(
@@ -170,7 +170,7 @@
return response.release();
}
-CIMResponseMessage* CIMEnumerateClassNamesRequestMessage::buildResponse()
+CIMResponseMessage* CIMEnumerateClassNamesRequestMessage::buildResponse() const
{
AutoPtr<CIMEnumerateClassNamesResponseMessage> response(
new CIMEnumerateClassNamesResponseMessage(
@@ -182,7 +182,7 @@
return response.release();
}
-CIMResponseMessage* CIMEnumerateInstancesRequestMessage::buildResponse()
+CIMResponseMessage* CIMEnumerateInstancesRequestMessage::buildResponse() const
{
AutoPtr<CIMEnumerateInstancesResponseMessage> response(
new CIMEnumerateInstancesResponseMessage(
@@ -194,7 +194,7 @@
return response.release();
}
-CIMResponseMessage* CIMEnumerateInstanceNamesRequestMessage::buildResponse()
+CIMResponseMessage* CIMEnumerateInstanceNamesRequestMessage::buildResponse() const
{
AutoPtr<CIMEnumerateInstanceNamesResponseMessage> response(
new CIMEnumerateInstanceNamesResponseMessage(
@@ -206,7 +206,7 @@
return response.release();
}
-CIMResponseMessage* CIMExecQueryRequestMessage::buildResponse()
+CIMResponseMessage* CIMExecQueryRequestMessage::buildResponse() const
{
AutoPtr<CIMExecQueryResponseMessage> response(
new CIMExecQueryResponseMessage(
@@ -218,7 +218,7 @@
return response.release();
}
-CIMResponseMessage* CIMAssociatorsRequestMessage::buildResponse()
+CIMResponseMessage* CIMAssociatorsRequestMessage::buildResponse() const
{
AutoPtr<CIMAssociatorsResponseMessage> response(
new CIMAssociatorsResponseMessage(
@@ -230,7 +230,7 @@
return response.release();
}
-CIMResponseMessage* CIMAssociatorNamesRequestMessage::buildResponse()
+CIMResponseMessage* CIMAssociatorNamesRequestMessage::buildResponse() const
{
AutoPtr<CIMAssociatorNamesResponseMessage> response(
new CIMAssociatorNamesResponseMessage(
@@ -242,7 +242,7 @@
return response.release();
}
-CIMResponseMessage* CIMReferencesRequestMessage::buildResponse()
+CIMResponseMessage* CIMReferencesRequestMessage::buildResponse() const
{
AutoPtr<CIMReferencesResponseMessage> response(
new CIMReferencesResponseMessage(
@@ -254,7 +254,7 @@
return response.release();
}
-CIMResponseMessage* CIMReferenceNamesRequestMessage::buildResponse()
+CIMResponseMessage* CIMReferenceNamesRequestMessage::buildResponse() const
{
AutoPtr<CIMReferenceNamesResponseMessage> response(
new CIMReferenceNamesResponseMessage(
@@ -266,7 +266,7 @@
return response.release();
}
-CIMResponseMessage* CIMGetPropertyRequestMessage::buildResponse()
+CIMResponseMessage* CIMGetPropertyRequestMessage::buildResponse() const
{
AutoPtr<CIMGetPropertyResponseMessage> response(
new CIMGetPropertyResponseMessage(
@@ -278,7 +278,7 @@
return response.release();
}
-CIMResponseMessage* CIMSetPropertyRequestMessage::buildResponse()
+CIMResponseMessage* CIMSetPropertyRequestMessage::buildResponse() const
{
AutoPtr<CIMSetPropertyResponseMessage> response(
new CIMSetPropertyResponseMessage(
@@ -289,7 +289,7 @@
return response.release();
}
-CIMResponseMessage* CIMGetQualifierRequestMessage::buildResponse()
+CIMResponseMessage* CIMGetQualifierRequestMessage::buildResponse() const
{
AutoPtr<CIMGetQualifierResponseMessage> response(
new CIMGetQualifierResponseMessage(
@@ -301,7 +301,7 @@
return response.release();
}
-CIMResponseMessage* CIMSetQualifierRequestMessage::buildResponse()
+CIMResponseMessage* CIMSetQualifierRequestMessage::buildResponse() const
{
AutoPtr<CIMSetQualifierResponseMessage> response(
new CIMSetQualifierResponseMessage(
@@ -312,7 +312,7 @@
return response.release();
}
-CIMResponseMessage* CIMDeleteQualifierRequestMessage::buildResponse()
+CIMResponseMessage* CIMDeleteQualifierRequestMessage::buildResponse() const
{
AutoPtr<CIMDeleteQualifierResponseMessage> response(
new CIMDeleteQualifierResponseMessage(
@@ -323,7 +323,7 @@
return response.release();
}
-CIMResponseMessage* CIMEnumerateQualifiersRequestMessage::buildResponse()
+CIMResponseMessage* CIMEnumerateQualifiersRequestMessage::buildResponse() const
{
AutoPtr<CIMEnumerateQualifiersResponseMessage> response(
new CIMEnumerateQualifiersResponseMessage(
@@ -335,7 +335,7 @@
return response.release();
}
-CIMResponseMessage* CIMInvokeMethodRequestMessage::buildResponse()
+CIMResponseMessage* CIMInvokeMethodRequestMessage::buildResponse() const
{
AutoPtr<CIMInvokeMethodResponseMessage> response(
new CIMInvokeMethodResponseMessage(
@@ -349,7 +349,7 @@
return response.release();
}
-CIMResponseMessage* CIMProcessIndicationRequestMessage::buildResponse()
+CIMResponseMessage* CIMProcessIndicationRequestMessage::buildResponse() const
{
AutoPtr<CIMProcessIndicationResponseMessage> response(
new CIMProcessIndicationResponseMessage(
@@ -360,7 +360,7 @@
return response.release();
}
-CIMResponseMessage* CIMNotifyProviderRegistrationRequestMessage::buildResponse()
+CIMResponseMessage* CIMNotifyProviderRegistrationRequestMessage::buildResponse() const
{
AutoPtr<CIMNotifyProviderRegistrationResponseMessage> response(
new CIMNotifyProviderRegistrationResponseMessage(
@@ -371,7 +371,7 @@
return response.release();
}
-CIMResponseMessage* CIMNotifyProviderTerminationRequestMessage::buildResponse()
+CIMResponseMessage* CIMNotifyProviderTerminationRequestMessage::buildResponse() const
{
AutoPtr<CIMNotifyProviderTerminationResponseMessage> response(
new CIMNotifyProviderTerminationResponseMessage(
@@ -382,7 +382,7 @@
return response.release();
}
-CIMResponseMessage* CIMHandleIndicationRequestMessage::buildResponse()
+CIMResponseMessage* CIMHandleIndicationRequestMessage::buildResponse() const
{
AutoPtr<CIMHandleIndicationResponseMessage> response(
new CIMHandleIndicationResponseMessage(
@@ -393,7 +393,7 @@
return response.release();
}
-CIMResponseMessage* CIMCreateSubscriptionRequestMessage::buildResponse()
+CIMResponseMessage* CIMCreateSubscriptionRequestMessage::buildResponse() const
{
AutoPtr<CIMCreateSubscriptionResponseMessage> response(
new CIMCreateSubscriptionResponseMessage(
@@ -404,7 +404,7 @@
return response.release();
}
-CIMResponseMessage* CIMModifySubscriptionRequestMessage::buildResponse()
+CIMResponseMessage* CIMModifySubscriptionRequestMessage::buildResponse() const
{
AutoPtr<CIMModifySubscriptionResponseMessage> response(
new CIMModifySubscriptionResponseMessage(
@@ -415,7 +415,7 @@
return response.release();
}
-CIMResponseMessage* CIMDeleteSubscriptionRequestMessage::buildResponse()
+CIMResponseMessage* CIMDeleteSubscriptionRequestMessage::buildResponse() const
{
AutoPtr<CIMDeleteSubscriptionResponseMessage> response(
new CIMDeleteSubscriptionResponseMessage(
@@ -427,7 +427,7 @@
}
CIMResponseMessage*
- CIMSubscriptionInitCompleteRequestMessage::buildResponse()
+ CIMSubscriptionInitCompleteRequestMessage::buildResponse() const
{
AutoPtr<CIMSubscriptionInitCompleteResponseMessage> response(
new CIMSubscriptionInitCompleteResponseMessage(
@@ -438,7 +438,7 @@
return response.release();
}
-CIMResponseMessage* CIMDisableModuleRequestMessage::buildResponse()
+CIMResponseMessage* CIMDisableModuleRequestMessage::buildResponse() const
{
AutoPtr<CIMDisableModuleResponseMessage> response(
new CIMDisableModuleResponseMessage(
@@ -450,7 +450,7 @@
return response.release();
}
-CIMResponseMessage* CIMEnableModuleRequestMessage::buildResponse()
+CIMResponseMessage* CIMEnableModuleRequestMessage::buildResponse() const
{
AutoPtr<CIMEnableModuleResponseMessage> response(
new CIMEnableModuleResponseMessage(
@@ -462,7 +462,7 @@
return response.release();
}
-CIMResponseMessage* CIMNotifyProviderEnableRequestMessage::buildResponse()
+CIMResponseMessage* CIMNotifyProviderEnableRequestMessage::buildResponse() const
{
AutoPtr<CIMNotifyProviderEnableResponseMessage> response(
new CIMNotifyProviderEnableResponseMessage(
@@ -484,7 +484,7 @@
return response.release();
}
-CIMResponseMessage* CIMStopAllProvidersRequestMessage::buildResponse()
+CIMResponseMessage* CIMStopAllProvidersRequestMessage::buildResponse() const
{
AutoPtr<CIMStopAllProvidersResponseMessage> response(
new CIMStopAllProvidersResponseMessage(
@@ -495,7 +495,7 @@
return response.release();
}
-CIMResponseMessage* CIMInitializeProviderRequestMessage::buildResponse()
+CIMResponseMessage* CIMInitializeProviderRequestMessage::buildResponse() const
{
AutoPtr<CIMInitializeProviderResponseMessage> response(
new CIMInitializeProviderResponseMessage(
@@ -506,7 +506,7 @@
return response.release();
}
-CIMResponseMessage* CIMInitializeProviderAgentRequestMessage::buildResponse()
+CIMResponseMessage* CIMInitializeProviderAgentRequestMessage::buildResponse() const
{
AutoPtr<CIMInitializeProviderAgentResponseMessage> response(
new CIMInitializeProviderAgentResponseMessage(
@@ -517,7 +517,7 @@
return response.release();
}
-CIMResponseMessage* CIMNotifyConfigChangeRequestMessage::buildResponse()
+CIMResponseMessage* CIMNotifyConfigChangeRequestMessage::buildResponse() const
{
AutoPtr<CIMNotifyConfigChangeResponseMessage> response(
new CIMNotifyConfigChangeResponseMessage(
--- pegasus/src/Pegasus/Common/CIMMessage.h.obz5083 2006-05-31 12:18:40.000000000 -0400
+++ pegasus/src/Pegasus/Common/CIMMessage.h 2006-05-31 13:13:35.000000000 -0400
@@ -124,7 +124,7 @@
CIMRequestMessage(
Uint32 type_, const String& messageId_, const QueueIdStack& queueIds_);
- virtual CIMResponseMessage* buildResponse() = 0;
+ virtual CIMResponseMessage* buildResponse() const = 0;
#ifdef PEGASUS_DEBUG
virtual void print(PEGASUS_STD(ostream)& os, Boolean printHeader) const
@@ -160,7 +160,7 @@
const CIMException& cimException_,
const QueueIdStack& queueIds_);
- void syncAttributes(CIMRequestMessage* request);
+ void syncAttributes(const CIMRequestMessage* request);
QueueIdStack queueIds;
CIMException cimException;
@@ -228,7 +228,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
Boolean localOnly;
Boolean includeQualifiers;
@@ -266,7 +266,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath instanceName;
Boolean localOnly;
@@ -297,7 +297,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String destinationPath;
CIMInstance indicationInstance;
@@ -325,7 +325,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String authType;
String userName;
@@ -351,7 +351,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath instanceName;
String authType;
@@ -379,7 +379,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMClass newClass;
String authType;
@@ -406,7 +406,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMInstance newInstance;
String authType;
@@ -434,7 +434,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMClass modifiedClass;
String authType;
@@ -465,7 +465,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMInstance modifiedInstance;
Boolean includeQualifiers;
@@ -502,7 +502,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
Boolean deepInheritance;
Boolean localOnly;
@@ -534,7 +534,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
Boolean deepInheritance;
String authType;
@@ -570,7 +570,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
Boolean deepInheritance;
Boolean localOnly;
@@ -623,7 +623,7 @@
}
#endif
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String authType;
String userName;
@@ -652,7 +652,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String queryLanguage;
String query;
@@ -695,7 +695,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath objectName;
CIMName assocClass;
@@ -738,7 +738,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath objectName;
CIMName assocClass;
@@ -780,7 +780,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath objectName;
CIMName resultClass;
@@ -817,7 +817,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath objectName;
CIMName resultClass;
@@ -848,7 +848,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath instanceName;
CIMName propertyName;
@@ -880,7 +880,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath instanceName;
CIMName propertyName;
@@ -910,7 +910,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMName qualifierName;
String authType;
@@ -938,7 +938,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMQualifierDecl qualifierDeclaration;
String authType;
@@ -966,7 +966,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMName qualifierName;
String authType;
@@ -992,7 +992,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String authType;
String userName;
@@ -1023,7 +1023,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMObjectPath instanceName;
CIMName methodName;
@@ -1052,7 +1052,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMNamespaceName nameSpace;
CIMInstance indicationInstance;
@@ -1090,7 +1090,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMName className;
Array <CIMNamespaceName> newNamespaces;
@@ -1115,7 +1115,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
Array <CIMInstance> providers;
};
@@ -1144,7 +1144,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMNamespaceName nameSpace;
CIMInstance handlerInstance;
@@ -1184,7 +1184,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMNamespaceName nameSpace;
CIMInstance subscriptionInstance;
@@ -1226,7 +1226,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMNamespaceName nameSpace;
CIMInstance subscriptionInstance;
@@ -1262,7 +1262,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMNamespaceName nameSpace;
CIMInstance subscriptionInstance;
@@ -1286,7 +1286,7 @@
{
}
- virtual CIMResponseMessage * buildResponse ();
+ virtual CIMResponseMessage* buildResponse() const;
};
class PEGASUS_COMMON_LINKAGE CIMDisableModuleRequestMessage
@@ -1315,7 +1315,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMInstance providerModule;
Array<CIMInstance> providers;
@@ -1345,7 +1345,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
CIMInstance providerModule;
String authType;
@@ -1368,7 +1368,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
Array <CIMInstance> capInstances;
};
@@ -1411,7 +1411,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
};
class PEGASUS_COMMON_LINKAGE CIMInitializeProviderRequestMessage
@@ -1428,7 +1428,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
};
// Used to pass initialization data to an Out-of-Process Provider Agent process
@@ -1454,7 +1454,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String pegasusHome;
Array<Pair<String, String> > configProperties;
@@ -1482,7 +1482,7 @@
{
}
- virtual CIMResponseMessage* buildResponse();
+ virtual CIMResponseMessage* buildResponse() const;
String propertyName;
String newPropertyValue;

2
tog-pegasus.spec
View File

@ -31,7 +31,7 @@
%define pegasus_uid 66
Version: 2.5.1
Release: 4%{?LINUX_VERSION:.%{LINUX_VERSION}}
Release: 6%{?LINUX_VERSION:.%{LINUX_VERSION}}
Epoch: 2
#
Summary: OpenPegasus WBEM Services for Linux