From 58c05bca8c1800d1a6efbd845b7b26b67579d894 Mon Sep 17 00:00:00 2001 From: vcrhonek Date: Thu, 30 Aug 2007 10:33:37 +0000 Subject: [PATCH] update to 2.6.1, fix wrong init script (#245339) --- pegasus-2.5-add_cmpi_provider_lib.patch | 11 - pegasus-2.5-bz173401.patch | 25 - pegasus-2.5-enable_cql.patch | 11 - pegasus-2.5-install_id.patch | 25 - pegasus-2.5-local-or-remote-auth.patch | 429 - pegasus-2.5-make_install.patch | 7430 ----------------- pegasus-2.5-redhat.patch | 778 -- pegasus-2.5-syslog_h.patch | 11 - pegasus-2.5.1-AutoPtr-Core.patch | 12 - pegasus-2.5.1-HOSTNAME_MAX.patch | 136 - pegasus-2.5.1-PATH_MAX.patch | 18 - pegasus-2.5.1-PIE.patch | 134 - pegasus-2.5.1-bz198185.patch | 11 - pegasus-2.5.1-cmpi-provider-lib.patch | 24 - pegasus-2.5.1-enable_cql.patch | 40 - pegasus-2.5.1-fix_repupgrade.patch | 15 - pegasus-2.5.1-fix_zseries_flags.patch | 16 - pegasus-2.5.1-linkflags.patch | 26 - pegasus-2.5.1-local-or-remote-auth.patch | 439 - pegasus-2.5.1-no-rpath.patch | 81 - pegasus-2.5.1-obz4934.patch | 56 - pegasus-2.5.1-obz4945.patch | 102 - pegasus-2.5.1-obz4955.patch | 605 -- pegasus-2.5.1-obz4956.patch | 92 - pegasus-2.5.1-obz4968_upcalls_oop.patch | 65 - pegasus-2.5.1-obz4978.patch | 313 - pegasus-2.5.1-obz4983.patch | 18 - pegasus-2.5.1-obz4984.patch | 269 - pegasus-2.5.1-obz4986.patch | 1032 --- pegasus-2.5.1-obz5046.patch | 36 - pegasus-2.5.1-obz5047.patch | 21 - pegasus-2.5.1-obz5048.patch | 25 - pegasus-2.5.1-obz5049.patch | 32 - pegasus-2.5.1-obz5051.patch | 1664 ---- pegasus-2.5.1-obz5053.patch | 240 - pegasus-2.5.1-obz5059.patch | 11 - pegasus-2.5.1-obz5072.patch | 58 - pegasus-2.5.1-obz5073.patch | 144 - pegasus-2.5.1-obz5083.patch | 751 -- pegasus-2.5.1-obz5090.patch | 46 - pegasus-2.5.1-obz5115.patch | 67 - pegasus-2.5.1-obz5119.patch | 29 - pegasus-2.5.1-obz5180.patch | 67 - pegasus-2.5.1-parallel_make.patch | 29 - pegasus-2.5.2-PATH_MAX.patch | 11 - pegasus-2.5.2-cmpi-provider-lib.patch | 11 - pegasus-2.5.2-local-or-remote-auth.patch | 439 - pegasus-2.6.1-init_script.patch | 81 + ...> pegasus-2.6.1-local-or-remote-auth.patch | 144 +- sources | 2 +- tog-pegasus.spec | 16 +- 51 files changed, 159 insertions(+), 15989 deletions(-) delete mode 100644 pegasus-2.5-add_cmpi_provider_lib.patch delete mode 100644 pegasus-2.5-bz173401.patch delete mode 100644 pegasus-2.5-enable_cql.patch delete mode 100644 pegasus-2.5-install_id.patch delete mode 100644 pegasus-2.5-local-or-remote-auth.patch delete mode 100644 pegasus-2.5-make_install.patch delete mode 100644 pegasus-2.5-redhat.patch delete mode 100644 pegasus-2.5-syslog_h.patch delete mode 100644 pegasus-2.5.1-AutoPtr-Core.patch delete mode 100644 pegasus-2.5.1-HOSTNAME_MAX.patch delete mode 100644 pegasus-2.5.1-PATH_MAX.patch delete mode 100644 pegasus-2.5.1-PIE.patch delete mode 100644 pegasus-2.5.1-bz198185.patch delete mode 100644 pegasus-2.5.1-cmpi-provider-lib.patch delete mode 100644 pegasus-2.5.1-enable_cql.patch delete mode 100644 pegasus-2.5.1-fix_repupgrade.patch delete mode 100644 pegasus-2.5.1-fix_zseries_flags.patch delete mode 100644 pegasus-2.5.1-linkflags.patch delete mode 100644 pegasus-2.5.1-local-or-remote-auth.patch delete mode 100644 pegasus-2.5.1-no-rpath.patch delete mode 100644 pegasus-2.5.1-obz4934.patch delete mode 100644 pegasus-2.5.1-obz4945.patch delete mode 100644 pegasus-2.5.1-obz4955.patch delete mode 100644 pegasus-2.5.1-obz4956.patch delete mode 100644 pegasus-2.5.1-obz4968_upcalls_oop.patch delete mode 100644 pegasus-2.5.1-obz4978.patch delete mode 100644 pegasus-2.5.1-obz4983.patch delete mode 100644 pegasus-2.5.1-obz4984.patch delete mode 100644 pegasus-2.5.1-obz4986.patch delete mode 100644 pegasus-2.5.1-obz5046.patch delete mode 100644 pegasus-2.5.1-obz5047.patch delete mode 100644 pegasus-2.5.1-obz5048.patch delete mode 100644 pegasus-2.5.1-obz5049.patch delete mode 100644 pegasus-2.5.1-obz5051.patch delete mode 100644 pegasus-2.5.1-obz5053.patch delete mode 100644 pegasus-2.5.1-obz5059.patch delete mode 100644 pegasus-2.5.1-obz5072.patch delete mode 100644 pegasus-2.5.1-obz5073.patch delete mode 100644 pegasus-2.5.1-obz5083.patch delete mode 100644 pegasus-2.5.1-obz5090.patch delete mode 100644 pegasus-2.5.1-obz5115.patch delete mode 100644 pegasus-2.5.1-obz5119.patch delete mode 100644 pegasus-2.5.1-obz5180.patch delete mode 100644 pegasus-2.5.1-parallel_make.patch delete mode 100644 pegasus-2.5.2-PATH_MAX.patch delete mode 100644 pegasus-2.5.2-cmpi-provider-lib.patch delete mode 100644 pegasus-2.5.2-local-or-remote-auth.patch create mode 100644 pegasus-2.6.1-init_script.patch rename pegasus-2.6.0-local-or-remote-auth.patch => pegasus-2.6.1-local-or-remote-auth.patch (69%) diff --git a/pegasus-2.5-add_cmpi_provider_lib.patch b/pegasus-2.5-add_cmpi_provider_lib.patch deleted file mode 100644 index 5081dba..0000000 --- a/pegasus-2.5-add_cmpi_provider_lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h.add_cmpi_provider_lib 2005-10-03 17:15:32.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h 2005-10-31 12:58:45.000000000 -0500 -@@ -56,7 +56,7 @@ - {"exportSSLTrustStore", "/etc/Pegasus/indication_trust"}, - {"crlStore", "/etc/Pegasus/crl"}, - {"repositoryDir", "/var/lib/Pegasus/repository"}, -- {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers"}, -+ {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers:" PEGASUS_DEST_LIB_DIR "/cmpi" }, - {"messageDir", "/usr/share/locale"}, - #endif - #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB) diff --git a/pegasus-2.5-bz173401.patch b/pegasus-2.5-bz173401.patch deleted file mode 100644 index 1a5fdc0..0000000 --- a/pegasus-2.5-bz173401.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- pegasus-2.5/src/Pegasus/Common/SSLContext.cpp.bz173401 2005-11-16 14:53:24.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Common/SSLContext.cpp 2005-11-16 18:12:59.000000000 -0500 -@@ -810,7 +810,8 @@ - // create SSL Context Area - // - -- if (!( sslContext = SSL_CTX_new(SSLv23_method()) )) -+// if (!( sslContext = SSL_CTX_new(SSLv23_method()) )) -+ if (!( sslContext = SSL_CTX_new(SSLv3_method()) )) - { - PEG_METHOD_EXIT(); - //l10n -@@ -839,9 +840,9 @@ - SSL_CTX_set_session_cache_mode(sslContext, SSL_SESS_CACHE_OFF); - - int options = SSL_OP_ALL; --#ifndef PEGASUS_ENABLE_SSLV2 //SSLv2 is disabled by default -- options |= SSL_OP_NO_SSLv2; --#endif -+//#ifndef PEGASUS_ENABLE_SSLV2 //SSLv2 is disabled by default -+// options |= SSL_OP_NO_SSLv2; -+//#endif - SSL_CTX_set_options(sslContext, options); - - if (_verifyPeer) diff --git a/pegasus-2.5-enable_cql.patch b/pegasus-2.5-enable_cql.patch deleted file mode 100644 index 7220829..0000000 --- a/pegasus-2.5-enable_cql.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pegasus-2.5/env_var_Linux.status.ENABLE_CQL 2005-10-31 13:05:39.000000000 -0500 -+++ pegasus-2.5/env_var_Linux.status 2005-11-09 19:40:03.000000000 -0500 -@@ -18,7 +18,7 @@ - PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir - endif - --PEGASUS_DISABLE_CQL=true -+PEGASUS_ENABLE_CQL=true - PEGASUS_DISABLE_OBJECT_NORMALIZATION=true - PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true - PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true diff --git a/pegasus-2.5-install_id.patch b/pegasus-2.5-install_id.patch deleted file mode 100644 index f510128..0000000 --- a/pegasus-2.5-install_id.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- pegasus-2.5/rpm/Makefile.install_id 2006-02-07 17:37:39.000000000 -0500 -+++ pegasus-2.5/rpm/Makefile 2006-02-07 18:39:05.000000000 -0500 -@@ -30,6 +30,9 @@ - - include $(ROOT)/mak/config.mak - -+INSTALL_USER?=root -+INSTALL_GROUP?=root -+ - #Defines subdirectories to go to recursively - - DIRS = manLinux -@@ -53,9 +56,9 @@ - - install: tog-pegasus.rc wbem cimserver_planned.conf - ifdef PEGASUS_INSTALL -- $(PEGASUS_INSTALL) -D -o root -g root -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus -- $(PEGASUS_INSTALL) -D -o root -g root -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf -- $(PEGASUS_INSTALL) -D -o root -g root -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem - mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR) $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR) - cp -fp manLinux/man1.Z/*.1 $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR)/ - cp -fp manLinux/man8.Z/*.8 $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/ diff --git a/pegasus-2.5-local-or-remote-auth.patch b/pegasus-2.5-local-or-remote-auth.patch deleted file mode 100644 index 03847f9..0000000 --- a/pegasus-2.5-local-or-remote-auth.patch +++ /dev/null @@ -1,429 +0,0 @@ ---- pegasus-2.5/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local_or_remote_auth 2005-08-13 20:28:32.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2005-09-28 16:18:58.000000000 -0400 -@@ -364,6 +364,9 @@ - } - } - -+ // Let Authenticators know whether this user is Local or Remote: -+ httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost ); -+ - // - // Handle authentication: - // ---- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2005-09-28 16:18:58.000000000 -0400 -@@ -90,7 +90,8 @@ - - Boolean PAMBasicAuthenticator::authenticate( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::authenticate()"); ---- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2005-09-28 16:18:58.000000000 -0400 -@@ -71,7 +71,8 @@ - */ - Boolean authenticate( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - /** Verify PAM account management for the requesting user. - @param userName String containing the user name -@@ -100,7 +101,8 @@ - - Boolean _authenticateByPAM( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - void _createPAMStandalone(); - -@@ -156,7 +158,8 @@ - */ - Boolean authenticate( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - /** Verify whether the user is valid. - @param userName String containing the user name -@@ -218,7 +221,8 @@ - - Boolean _authenticateByPAM( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - #if defined(PEGASUS_USE_PAM_STANDALONE_PROC) - PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone; ---- pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2005-09-28 16:18:58.000000000 -0400 -@@ -136,7 +136,7 @@ - authInfo->setAuthenticatedUser(userName); - authInfo->setAuthenticatedPassword(password); - #else -- authenticated = _basicAuthenticator->authenticate(userName, password); -+ authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser()); - - if (authenticated) - { ---- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local_or_remote_auth 2005-07-19 15:14:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2005-09-28 16:47:55.000000000 -0400 -@@ -129,7 +129,8 @@ - - Boolean PAMBasicAuthenticator::authenticate( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::authenticate()"); -@@ -137,7 +138,7 @@ - Boolean authenticated; - - #if !defined(PEGASUS_USE_PAM_STANDALONE_PROC) -- authenticated = _authenticateByPAM(userName, password); -+ authenticated = _authenticateByPAM(userName, password, isRemoteUser); - #else - // - // Mutex to Serialize Authentication calls. -@@ -145,8 +146,9 @@ - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "Authentication Mutex lock."); - AutoMutex lock(_authSerializeMutex); -- authenticated = _pamBasicAuthenticatorStandAlone.authenticate( -- userName, password); -+ authenticated = -+ _pamBasicAuthenticatorStandAlone->authenticate(userName, -+ password); - #endif - - PEG_METHOD_EXIT(); -@@ -155,7 +157,8 @@ - - Boolean PAMBasicAuthenticator::_authenticateByPAM( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::_authenticateByPAM()"); -@@ -165,6 +168,7 @@ - pam_handle_t *phandle; - char *name; - APP_DATA mydata; -+ int retcode; - - // - // Store the password for PAM authentication -@@ -178,21 +182,38 @@ - // Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - // "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s", - // (const char *)userName.getCString(), (const char *)password.getCString()); -+ -+ // NOTE: if any pam call should log anything, our syslog socket will be redirected -+ // to the AUTH facility, so we need to redirect it back after each pam call. - - // - //Call pam_start since you need to before making any other PAM calls - // -- if ( ( pam_start(service, -+ -+ if ( (retcode = pam_start(service, - (const char *)userName.getCString(), &pconv, &phandle) ) != PAM_SUCCESS ) - { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_start failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } -+ - -+ if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS ) -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } - // - //Call pam_authenticate to authenticate the user - // -- if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) -+ if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) - { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "pam_authenticate successful."); -@@ -201,22 +222,40 @@ - //checking for password and account expiration, as well as verifying access - //hour restrictions. - // -- if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) -+ -+ if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) - { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "pam_acct_mgmt successful."); - authenticated = true; -- } -+ }else -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(phandle, retcode)); -+ } -+ }else -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(phandle, retcode)); - } -- - // - //Call pam_end to end our PAM work - // - pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); - -- PEG_METHOD_EXIT(); -+ if ( ! authenticated ) -+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s", -+ isRemoteUser ? "remote" : "local", -+ (const char*)userName.getCString() -+ ); - -+ PEG_METHOD_EXIT(); - return (authenticated); -+ - } - - Boolean PAMBasicAuthenticator::validateUser(const String& userName) -@@ -231,6 +270,7 @@ - pam_handle_t *phandle; - char *name; - APP_DATA mydata; -+ int retcode; - - const char *service = "wbem"; - pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback; -@@ -239,21 +279,43 @@ - // - // Call pam_start since you need to before making any other PAM calls - // -- if ( pam_start(service, -- (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS) -- { -+ if ( (retcode = -+ pam_start(service,(const char *)userName.getCString(), &pconv, &phandle) -+ ) != PAM_SUCCESS -+ ) -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } - -+ if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS ) -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } - // - // Call pam_acct_mgmt, to check if the user account is valid. This includes - // checking for account expiration, as well as verifying access - // hour restrictions. - // -- if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS ) -- { -+ if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS ) -+ { - authenticated = true; -+ }else -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); - } - - // -@@ -261,6 +323,9 @@ - // - pam_end(phandle, 0); - -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ - #else - // - // Mutex to Serialize Authentication calls. ---- pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local_or_remote_auth 2005-07-12 14:05:09.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2005-09-28 16:18:58.000000000 -0400 -@@ -65,7 +65,8 @@ - */ - virtual Boolean authenticate( - const String& userName, -- const String& password) = 0; -+ const String& password, -+ Boolean isRemoteUser) = 0; - - /** Construct and return the HTTP Basic authentication challenge header - @return A string containing the authentication challenge header. ---- pegasus-2.5/src/Pegasus/Common/HTTPMessage.cpp.local_or_remote_auth 2005-05-31 21:51:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/HTTPMessage.cpp 2005-09-28 16:18:58.000000000 -0400 -@@ -101,7 +101,8 @@ - message(message_), - queueId(queueId_), - acceptLanguagesDecoded(false), -- contentLanguagesDecoded(false) -+ contentLanguagesDecoded(false), -+ fromRemoteHost(true) - { - if (cimException_) - cimException = *cimException_; ---- pegasus-2.5/src/Pegasus/Common/HTTPMessage.h.local_or_remote_auth 2005-05-12 02:59:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/HTTPMessage.h 2005-09-28 16:18:58.000000000 -0400 -@@ -77,7 +77,8 @@ - ContentLanguages contentLanguages; - Boolean acceptLanguagesDecoded; - Boolean contentLanguagesDecoded; -- CIMException cimException; -+ Boolean fromRemoteHost; -+ CIMException cimException; - - void parse( - String& startLine, ---- pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.cpp.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.cpp 2005-09-28 16:18:58.000000000 -0400 -@@ -55,7 +55,8 @@ - _privileged(false), - _authType(String::EMPTY), - _authStatus(NEW_REQUEST), -- _exportConnection(false) -+ _exportConnection(false), -+ _remoteUser(true) - { - PEG_METHOD_ENTER( - TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep"); -@@ -178,5 +179,14 @@ - PEG_METHOD_EXIT(); - } - -+void AuthenticationInfoRep::setRemoteUser(Boolean remoteUser) -+{ -+ PEG_METHOD_ENTER(TRC_AUTHENTICATION, -+ "AuthenticationInfoRep::setRemoteUser"); -+ -+ _remoteUser = remoteUser; -+ -+ PEG_METHOD_EXIT(); -+} - - PEGASUS_NAMESPACE_END ---- pegasus-2.5/src/Pegasus/Common/AuthenticationInfo.h.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfo.h 2005-09-28 16:18:58.000000000 -0400 -@@ -329,6 +329,22 @@ - _rep->setClientCertificate(clientCertificate); - } - -+ /** Indicate whether the user is Remote -+ */ -+ Boolean isRemoteUser() const -+ { -+ _checkRep(); -+ return _rep->isRemoteUser(); -+ } -+ -+ /** Set the Remote User flag -+ */ -+ void setRemoteUser(Boolean remoteUser) -+ { -+ _checkRep(); -+ _rep->setRemoteUser(remoteUser); -+ } -+ - private: - - AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep) ---- pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.h.local_or_remote_auth 2005-02-05 17:59:23.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Common/AuthenticationInfoRep.h 2005-09-28 16:18:58.000000000 -0400 -@@ -140,6 +140,14 @@ - - void setExportConnection(Boolean exportConnection); - -+ Boolean isRemoteUser() const -+ { -+ return _remoteUser; -+ } -+ -+ void setRemoteUser(Boolean remoteUser); -+ -+ - //PEP187 - SSLCertificateInfo* getClientCertificate() - { -@@ -170,7 +178,8 @@ - #endif - - Boolean _exportConnection; -- SSLCertificateInfo* _clientCertificate; -+ SSLCertificateInfo* _clientCertificate; -+ Boolean _remoteUser; - }; - - PEGASUS_NAMESPACE_END ---- pegasus-2.5/src/Pegasus/Common/HTTPConnection.cpp.local_or_remote_auth 2005-08-18 20:24:32.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/HTTPConnection.cpp 2005-09-28 16:18:58.000000000 -0400 -@@ -1807,6 +1807,30 @@ - "_requestCount = %d", _requestCount.value()); - message->dest = _outputMessageQueue->getQueueId(); - // SendForget(message); -+ -+ // Allow authenticators to differentiate Remote and Local users: -+ struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ... -+ socklen_t slen1=sizeof(struct sockaddr_in), slen2=sizeof(struct sockaddr_in); -+ uint32_t sock = _socket.get()->getSocket() ; -+ memset(&sin_peer,'\0',slen1); -+ memset(&sin_svr, '\0',slen2); -+ if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 ) -+ ||( ::getsockname( sock, (struct sockaddr*)&sin_svr, &slen2) == 0 ) -+ ) -+ { -+ if( sin_peer.sin_family == AF_INET ) -+ { -+ if( ((ntohl( sin_peer.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) -+ // message was sent FROM localhost interface -+ message->fromRemoteHost = false; -+ } -+ if( sin_svr.sin_family == AF_INET ) -+ { -+ if( ((ntohl( sin_svr.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) -+ // message was sent TO localhost interface -+ message->fromRemoteHost = false; -+ } -+ } - - // - // Set the entry status to BUSY. diff --git a/pegasus-2.5-make_install.patch b/pegasus-2.5-make_install.patch deleted file mode 100644 index 87d6bc4..0000000 --- a/pegasus-2.5-make_install.patch +++ /dev/null @@ -1,7430 +0,0 @@ ---- pegasus-2.5/Makefile.make_install 2005-05-12 11:27:24.000000000 -0400 -+++ pegasus-2.5/Makefile 2005-10-03 13:07:31.000000000 -0400 -@@ -60,12 +60,44 @@ - world: depend all repository - @ $(MAKE) -s tests - -+install: all repository repository_install sdk_install install_dirs install_scripts -+ -+sdk_install: -+ifdef PEGASUS_INSTALL -+ if [ -d $(PEGASUS_SDK_STAGING_DIR) ]; then \ -+ ( cd $(PEGASUS_SDK_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR); tar -xpf -); \ -+ fi; -+endif -+ -+install_dirs: -+ifdef PEGASUS_INSTALL -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOG_DIR) -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_VARRUN_DIR) -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOCAL_AUTH_DIR) -+endif -+ -+install_scripts: -+ifdef PEGASUS_INSTALL -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR) -+ echo "#!/bin/bash" > $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+ echo "PEGASUS_MOF_DIR="$(PEGASUS_MOF_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+ echo "PEGASUS_REPOSITORY_DIR="$(PEGASUS_REPOSITORY_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+ echo "PEGASUS_BIN_DIR="$(PEGASUS_BIN_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+ echo "PEGASUS_CIM_SCHEMA=29" >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+ cat installs/scripts/init_repository >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+ chown root:root $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository >/dev/null 2>&1 || :; -+ chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository -+endif -+ - # The repository Target removes and rebuilds the CIM repository - - # Note: Arguments must be quoted to preserve upper case characters in VMS. - repository: FORCE - @ $(MAKE) "-SC" Schemas/Pegasus repository - -+repository_install: repository -+ @ $(MAKE) "-SC" Schemas/Pegasus install_repository -+ - repositoryclean: FORCE - @ $(RMREPOSITORY) $(REPOSITORY_ROOT) - ---- pegasus-2.5/mak/SDKMakefile.make_install 2005-10-03 12:32:47.000000000 -0400 -+++ pegasus-2.5/mak/SDKMakefile 2005-10-03 12:32:47.000000000 -0400 -@@ -156,8 +156,7 @@ - Providers/Load \ - mak - --DOCSRCPATH1FILES = \ -- SecurityGuidelinesForDevelopers.html -+DOCSRCPATH1FILES = - - CLIENTSRCPATH1FILES = \ - Makefile \ -@@ -402,3 +401,8 @@ - testSDK: - @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile tests \ - PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -+ -+install: -+ifdef PEGASUS_INSTALL -+ (cd $(PEGASUS_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR)/; tar -xpf -) -+endif -\ No newline at end of file ---- pegasus-2.5/mak/program-unix.mak.make_install 2005-10-03 12:32:47.000000000 -0400 -+++ pegasus-2.5/mak/program-unix.mak 2005-10-03 12:32:47.000000000 -0400 -@@ -154,4 +154,4 @@ - - include $(ROOT)/mak/misc.mak - --include $(ROOT)/mak/install-program-unix.mak -+include $(PEGASUS_ROOT)/mak/install-program-unix.mak ---- /dev/null 2005-10-03 10:53:34.123398250 -0400 -+++ pegasus-2.5/mak/install-program-unix.mak 2005-10-03 12:32:47.000000000 -0400 -@@ -0,0 +1,16 @@ -+INSTALL_BIN?=bin -+INSTALL_USER?=root -+INSTALL_GROUP?=root -+INSTALL_MODE?=0755 -+install: $(PEGASUS_HOME)/bin/$(PROGRAM) -+ifdef PEGASUS_INSTALL -+ ifndef TEST -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/bin/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM) -+ else -+ ifeq ( $(TEST), 'INSTALL' ) -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_BIN_DIR)/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM) -+ endif -+ endif -+endif -+ -+ ---- /dev/null 2005-10-03 10:53:34.123398250 -0400 -+++ pegasus-2.5/mak/install-library-unix.mak 2005-10-03 12:32:47.000000000 -0400 -@@ -0,0 +1,16 @@ -+INSTALL_LIB?=$(PEGASUS_ARCH_LIB_DIR) -+INSTALL_USER?=root -+INSTALL_GROUP?=root -+INSTALL_MODE?=0755 -+install: $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) -+ifdef PEGASUS_INSTALL -+ ifndef TEST -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY)$(LIB_SUFFIX) -+ ln -s lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY).so -+ else -+ ifeq ( $(TEST), 'INSTALL' ) -+ echo 'TEST is '"'"$(TEST)"'" -+ $(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) -+ endif -+ endif -+endif ---- pegasus-2.5/mak/library-unix.mak.make_install 2005-10-03 12:32:47.000000000 -0400 -+++ pegasus-2.5/mak/library-unix.mak 2005-10-03 12:32:47.000000000 -0400 -@@ -165,4 +165,4 @@ - - FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) - --include $(ROOT)/mak/install-library-unix.mak -+include $(PEGASUS_ROOT)/mak/install-library-unix.mak ---- pegasus-2.5/mak/recurse.mak.make_install 2005-05-12 11:27:28.000000000 -0400 -+++ pegasus-2.5/mak/recurse.mak 2005-10-03 12:32:47.000000000 -0400 -@@ -76,3 +76,5 @@ - messages: $(RECURSE_DEPENDS) $(ERROR) - @ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) messages $(NL) ) - -+install: $(RECURSE_DEPENDS) $(ERROR) -+ @ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) install $(NL) ) ---- pegasus-2.5/rpm/Makefile.make_install 2005-05-12 11:27:29.000000000 -0400 -+++ pegasus-2.5/rpm/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -51,3 +51,13 @@ - - messages: - -+install: tog-pegasus.rc wbem cimserver_planned.conf -+ifdef PEGASUS_INSTALL -+ $(PEGASUS_INSTALL) -D -o root -g root -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus -+ $(PEGASUS_INSTALL) -D -o root -g root -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf -+ $(PEGASUS_INSTALL) -D -o root -g root -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR) $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR) -+ cp -fp manLinux/man1.Z/*.1 $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR)/ -+ cp -fp manLinux/man8.Z/*.8 $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/ -+ for f in manLinux/man1m.Z/*.1m; do F=$(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/`echo $$f | sed 's/1m$$/8/;s/.*\///g'`; if [ ! -f $$F ]; then cp -fp $$f $$F; fi; done -+endif -\ No newline at end of file ---- pegasus-2.5/test/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400 -+++ pegasus-2.5/test/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,11 +27,13 @@ - #// - #//============================================================================== - ROOT = .. -- -+TEST = true -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - wetest - -+TEST=true - include $(ROOT)/mak/recurse.mak - ---- pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -59,7 +59,9 @@ - - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - SAMPLEPROVIDERNS= root/SampleProvider -@@ -77,6 +79,7 @@ - - LOCAL_DEFINES=-DTEST_EXCEPTIONS - -+TEST=true - include $(PEGASUS_ROOT)/mak/library.mak - - client: ---- pegasus-2.5/test/TestProviders/CIMOMSample/Makefile.make_install 2005-05-12 11:33:41.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/CIMOMSample/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -61,7 +61,9 @@ - - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - SAMPLEPROVIDERNS= root/SampleProvider -@@ -77,6 +79,7 @@ - CIMOMSampleProvider.cpp \ - CIMOMSampleProviderMain.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/library.mak - - client: ---- pegasus-2.5/test/TestProviders/LoadMOFs/Makefile.make_install 2005-05-12 11:33:42.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/LoadMOFs/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -71,7 +71,9 @@ - - ROOT = $(PEGASUS_ROOT) - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # Loads the sample MOF into a separate namespace. ---- pegasus-2.5/test/TestProviders/TimingTests/Makefile.make_install 2005-05-12 11:33:43.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/TimingTests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -62,7 +62,9 @@ - - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - SAMPLEPROVIDERNS= root/SampleProvider -@@ -80,4 +82,5 @@ - LOCAL_DEFINES=-DPEGASUS_DEBUG - #LOCAL_DEFINES=-DNO_OF_INSTANCES=200 - -+TEST=true - include $(PEGASUS_ROOT)/mak/library.mak ---- pegasus-2.5/test/TestProviders/Makefile.make_install 2005-05-12 11:33:42.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - DIRS = ExceptionsTest \ -@@ -39,4 +41,5 @@ - XMLParserGen \ - LoadMOFs - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/test/TestProviders/LargeDataProvider/Makefile.make_install 2005-05-12 11:33:42.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/LargeDataProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -61,7 +61,9 @@ - - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - SAMPLEPROVIDERNS= root/SampleProvider -@@ -79,6 +81,7 @@ - - LOCAL_DEFINES=-DNO_OF_INSTANCES=200 - -+TEST=true - include $(PEGASUS_ROOT)/mak/library.mak - - client: ---- pegasus-2.5/test/TestProviders/XMLParserGen/Makefile.make_install 2005-05-12 11:33:43.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/XMLParserGen/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -62,7 +62,9 @@ - - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - SAMPLEPROVIDERNS= root/SampleProvider -@@ -78,4 +80,5 @@ - ParserTestProvider.cpp \ - ParserTestProviderMain.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/library.mak ---- pegasus-2.5/test/TestProviders/MultithreadingTests/Makefile.make_install 2005-05-12 11:33:43.000000000 -0400 -+++ pegasus-2.5/test/TestProviders/MultithreadingTests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -62,7 +62,9 @@ - - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - SAMPLEPROVIDERNS= root/SampleProvider -@@ -80,4 +82,5 @@ - - #LOCAL_DEFINES=-DNO_OF_INSTANCES=200 - -+TEST=true - include $(PEGASUS_ROOT)/mak/library.mak ---- pegasus-2.5/test/wetest/Makefile.make_install 2005-05-12 11:33:44.000000000 -0400 -+++ pegasus-2.5/test/wetest/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - #Defines subdirectories to go to recursively -@@ -42,6 +44,7 @@ - - # This is a recurse make file - -+TEST=true - include $(ROOT)/mak/recurse.mak - - repository: $(RECURSE_DEPENDS) $(ERROR) -@@ -54,3 +57,6 @@ - @ $(foreach i, $(LOADDIRS), $(MAKESH) $(MAKE) "-SC" $(i) removerepository $(NL) ) - - #DO NOT DELETE THIS LINE -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/References/Makefile.make_install 2005-05-12 11:33:49.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/References/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,9 +29,15 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = References45000 References45001 References45002 References45003 References45004 References45005 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/EnumerateClasses/Makefile.make_install 2005-05-18 21:58:51.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/EnumerateClasses/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - -@@ -62,4 +64,8 @@ - - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/ModifyClass/Makefile.make_install 2005-05-12 11:33:49.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/ModifyClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = ModifyClass43000 ModifyClass43001 ModifyClass43003 ModifyClass43004 ModifyClass43005 -@@ -38,4 +40,8 @@ - ModifyClass43002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/GetQualifier/Makefile.make_install 2005-05-12 11:33:48.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/GetQualifier/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - # - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = GetQualifier37000 GetQualifier37002 -@@ -40,4 +42,8 @@ - GetQualifier37001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/EnumerateClassNames/Makefile.make_install 2005-05-18 21:58:51.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/EnumerateClassNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - # - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - -@@ -61,4 +63,8 @@ - endif - - endif -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/GetClass/Makefile.make_install 2005-05-12 11:33:47.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/GetClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - # - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = \ -@@ -55,4 +57,7 @@ - GetClass00016 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: ---- pegasus-2.5/test/wetest/cimv2/EnumerateInstances/Makefile.make_install 2005-05-12 11:33:47.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/EnumerateInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,9 +29,15 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = EnumerateInstances60000 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/Makefile.make_install 2005-05-12 11:33:48.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,7 +31,9 @@ - # - ROOT=../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - DIRS = \ -@@ -54,5 +56,9 @@ - EnumerateClassNames - - -+TEST=true - include $(ROOT)/mak/recurse.mak - -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/AssociatorNames/Makefile.make_install 2005-05-12 11:33:44.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/AssociatorNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,9 +29,14 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = AssociatorNames30000 AssociatorNames30001 AssociatorNames30002 AssociatorNames30003 AssociatorNames30004 AssociatorNames30005 AssociatorNames30006 AssociatorNames30007 AssociatorNames30008 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: ---- pegasus-2.5/test/wetest/cimv2/ReferenceNames/Makefile.make_install 2005-05-12 11:33:49.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/ReferenceNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,9 +29,15 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = ReferenceNames61000 ReferenceNames61001 ReferenceNames61002 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/CreateClass/Makefile.make_install 2005-05-12 11:33:45.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/CreateClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - # - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = CreateClass34000 CreateClass34001 CreateClass34002 CreateClass34004 CreateClass34005 CreateClass34006 CreateClass34007 CreateClass34008 CreateClass34009 CreateClass34010 CreateClass34011 -@@ -40,4 +42,8 @@ - CreateClass34003 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/SetQualifier/Makefile.make_install 2005-05-12 11:33:49.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/SetQualifier/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = SetQualifier38000 SetQualifier38001 -@@ -38,4 +40,8 @@ - SetQualifier38002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/DeleteClass/Makefile.make_install 2005-05-12 11:33:45.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/DeleteClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - # - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = DeleteClass36000 DeleteClass36001 DeleteClass36003 DeleteClass36004 DeleteClass36007 DeleteClass36008 DeleteClass36009 DeleteClass36010 -@@ -40,4 +42,8 @@ - DeleteClass36002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/Load/Makefile.make_install 2005-05-12 11:33:48.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,7 +34,9 @@ - # remove function. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # The following variable determine the version of the Schema to -@@ -89,3 +91,5 @@ - poststarttests: - - general: -+ -+install: ---- pegasus-2.5/test/wetest/cimv2/EnumerateQualifiers/Makefile.make_install 2005-05-12 11:33:47.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/EnumerateQualifiers/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = -@@ -41,4 +43,8 @@ - EnumerateQualifiers31001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/EnumerateInstanceNames/Makefile.make_install 2005-05-12 11:33:46.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/EnumerateInstanceNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = EnumerateInstanceNames25000 EnumerateInstanceNames25002 -@@ -39,4 +41,8 @@ - EnumerateInstanceNames25001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/cimv2/Associators/Makefile.make_install 2005-05-12 11:33:44.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/Associators/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,9 +29,14 @@ - - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = Associators33000 Associators33001 Associators33002 Associators33003 Associators33004 Associators33005 Associators33006 Associators33007 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -\ No newline at end of file ---- pegasus-2.5/test/wetest/cimv2/DeleteQualifier/Makefile.make_install 2005-05-12 11:33:45.000000000 -0400 -+++ pegasus-2.5/test/wetest/cimv2/DeleteQualifier/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = DeleteQualifier39000 DeleteQualifier39001 DeleteQualifier39003 -@@ -38,4 +40,8 @@ - DeleteQualifier39002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/Property/Makefile.make_install 2005-07-27 16:51:13.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/Property/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = \ -@@ -39,4 +41,8 @@ - SetProperty82202 \ - SetProperty82300 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/ModifyClass/Makefile.make_install 2005-05-12 11:33:53.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/ModifyClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,15 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = ModifyClass43006 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/CreateInstance/Makefile.make_install 2005-05-12 11:33:50.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/CreateInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = CreateInstance53000 CreateInstance53002 CreateInstance53003 CreateInstance53004 CreateInstance53005 CreateInstance53006 CreateInstance53007 CreateInstance53008 CreateInstance53009 CreateInstance53010 CreateInstance53011 CreateInstance53012 CreateInstance53013 CreateInstance53014 CreateInstance53015 CreateInstance53016 CreateInstance53017 CreateInstance53018 CreateInstance53019 CreateInstance53020 CreateInstance53021 CreateInstance53022 CreateInstance53023 CreateInstance53024 CreateInstance53025 CreateInstance53026 CreateInstance53027 CreateInstance53028 CreateInstance53029 CreateInstance53030 CreateInstance53031 CreateInstance53032 CreateInstance53033 CreateInstance53034 CreateInstance53035 CreateInstance53036 CreateInstance53037 CreateInstance53038 CreateInstance53039 CreateInstance53040 CreateInstance53041 CreateInstance53042 CreateInstance53043 CreateInstance53044 CreateInstance53045 CreateInstance53046 CreateInstance53047 CreateInstance53048 CreateInstance53049 CreateInstance53050 CreateInstance53051 CreateInstance53052 CreateInstance53053 CreateInstance53054 CreateInstance53055 -@@ -37,4 +39,8 @@ - XMLSCRIPTS += CreateInstance53001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/EnumerateInstances/Makefile.make_install 2005-05-12 11:33:51.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/EnumerateInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = EnumerateInstances51003 -@@ -62,4 +64,8 @@ - XmlScriptDefects: DeepLocalFT51006 \ - DeepLocalTT51004 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/GetInstance/Makefile.make_install 2005-05-12 11:33:52.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/GetInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = GetInstance52000 GetInstance52001 GetInstance52002 GetInstance52003 GetInstance52005 GetInstance52006 -@@ -41,4 +43,8 @@ - XMLSCRIPTS += GetInstance52004 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/Makefile.make_install 2005-05-12 11:33:53.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT=../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - DIRS = \ -@@ -47,5 +49,9 @@ - # ModifyClass\ - # DeleteClass - -+TEST=true - include $(ROOT)/mak/recurse.mak - -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/ModifyInstance/Makefile.make_install 2005-05-12 11:33:53.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/ModifyInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = ModifyInstance54000 ModifyInstance54003 ModifyInstance54004 ModifyInstance54005 ModifyInstance54006 -@@ -39,4 +41,8 @@ - ModifyInstance54002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/ErrorXml/Makefile.make_install 2005-05-12 11:33:51.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/ErrorXml/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = \ -@@ -87,4 +89,8 @@ - BadProtocolVersion03 - - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/DeleteClass/Makefile.make_install 2005-05-12 11:33:50.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/DeleteClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,15 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = DeleteClass36005 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/Load/Makefile.make_install 2005-05-12 11:33:53.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,7 +34,9 @@ - # remove function. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # The following variable determine the version of the Schema to -@@ -86,3 +88,6 @@ - poststarttests: - - general: -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/EnumerateInstanceNames/Makefile.make_install 2005-05-12 11:33:51.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/EnumerateInstanceNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = EnumerateInstanceNames50000 EnumerateInstanceNames50002 -@@ -37,4 +39,8 @@ - XMLSCRIPTS += EnumerateInstanceNames50001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/DeleteInstance/Makefile.make_install 2005-05-12 11:33:50.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/DeleteInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = DeleteInstance55000 DeleteInstance55001 DeleteInstance55003 -@@ -38,4 +40,8 @@ - DeleteInstance55002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/test/wetest/static/Headers/Makefile.make_install 2005-05-12 11:33:52.000000000 -0400 -+++ pegasus-2.5/test/wetest/static/Headers/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - - ROOT = ../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = \ -@@ -65,4 +67,8 @@ - BadCIMObjectValueEncoding03 \ - GoodCIMObjectValueEncoding01 - -+TEST=true - include $(ROOT)/test/configend.mak -+ -+install: -+ ---- pegasus-2.5/src/slp/tests/Makefile.make_install 2005-05-12 11:33:38.000000000 -0400 -+++ pegasus-2.5/src/slp/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,13 @@ - #//============================================================================== - ROOT=../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - srv_reg - -+TEST=true - include $(ROOT)/mak/recurse.mak -+ -+install: ---- pegasus-2.5/src/slp/tests/srv_reg/Makefile.make_install 2005-05-12 11:33:38.000000000 -0400 -+++ pegasus-2.5/src/slp/tests/srv_reg/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = $(PEGASUS_ROOT) - DIR = Pegasus/../slp/tests/srvreg -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = srv_reg - SOURCES = srv_reg.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Listener/tests/Makefile.make_install 2005-05-12 11:30:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Listener/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - TestListener - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Listener/tests/TestListener/Makefile.make_install 2005-05-12 11:30:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Listener/tests/TestListener/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Listener/tests/TestListener -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -DPEGASUS_CONSUMER_INTERNAL -@@ -36,6 +38,7 @@ - PROGRAM = TestListener - SOURCES = TestListener.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/HandlerService/tests/Makefile.make_install 2005-05-12 11:29:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/HandlerService/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - HandlerTable - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/HandlerService/tests/HandlerTable/Makefile.make_install 2005-05-12 11:29:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/HandlerService/tests/HandlerTable/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Server/IndicationService/tests/HandlerTable -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = HandlerTable.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Compiler/tests/Makefile.make_install 2005-05-12 11:29:44.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Compiler/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - CompAssoc - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Compiler/tests/CompAssoc/Makefile.make_install 2005-05-12 11:29:44.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Compiler/tests/CompAssoc/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Compiler/tests/CompAssoc -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = CompAssoc - SOURCES = CompAssoc.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - MOF_PATH = $(ROOT)/Schemas/CIM25 ---- pegasus-2.5/src/Pegasus/Compiler/cmdline/tests/Makefile.make_install 2005-05-12 11:29:43.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Compiler/cmdline/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,7 +32,9 @@ - - MOF_PATH = $(ROOT)/Schemas/CIM25 - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - RESULTFILE = $(TMP_DIR)/cmdline_result -@@ -148,3 +150,4 @@ - - poststarttests: - -+install: ---- pegasus-2.5/src/Pegasus/Compiler/cmdline/Makefile.make_install 2005-05-12 11:29:42.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Compiler/cmdline/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -36,3 +36,4 @@ - - include $(ROOT)/mak/recurse.mak - -+install: ---- pegasus-2.5/src/Pegasus/Compiler/cmdline/cimmofl/Makefile.make_install 2005-05-12 11:29:43.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Compiler/cmdline/cimmofl/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -58,3 +58,4 @@ - - prepend-license: - -+install: ---- pegasus-2.5/src/Pegasus/Handler/SystemLogListenerDestination/tests/Makefile.make_install 2005-05-12 11:29:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Handler/SystemLogListenerDestination/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Handler/SystemLogListenerDestination/tests -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = SystemLogHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Handler/EmailListenerDestination/tests/Makefile.make_install 2005-05-12 11:29:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Handler/EmailListenerDestination/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Handler/EmailListenerDestination/tests -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = EmailHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerService/Makefile.make_install 2005-05-12 11:31:02.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/tests/ProviderManagerService -@@ -42,6 +43,7 @@ - - SOURCES = ProviderManagerService.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/Makefile.make_install 2005-05-12 11:31:01.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ -@@ -36,4 +37,5 @@ - ProviderManagerService \ - OperationResponseHandler - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManager/Makefile.make_install 2005-05-12 11:31:03.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Pegasus/ProviderManager2/tests/ProviderManager - -+TEST=true - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -54,4 +55,5 @@ - TestProviderManagerMain.cpp \ - TestProviderManager.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/Makefile.make_install 2005-05-12 11:31:02.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/tests/ProviderManagerModule -@@ -42,6 +43,7 @@ - - SOURCES = ProviderManagerModule.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/Lockable/Makefile.make_install 2005-05-12 11:31:01.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/Lockable/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/tests/Lockable -@@ -40,6 +41,7 @@ - - SOURCES = Lockable.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/SafeQueue/Makefile.make_install 2005-05-12 11:31:03.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/SafeQueue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/tests/SafeQueue -@@ -40,6 +41,7 @@ - - SOURCES = SafeQueue.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/OperationResponseHandler/Makefile.make_install 2005-05-12 11:31:02.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/OperationResponseHandler/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Pegasus/ProviderManager2/tests/OperationResponseHandler - -+TEST=true - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -47,6 +48,7 @@ - SOURCES = \ - TestOperationResponseHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Property/Makefile.make_install 2005-05-12 11:31:00.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Property/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = \ -@@ -38,4 +40,5 @@ - SetProperty82200 \ - SetProperty82300 - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyClass/Makefile.make_install 2005-05-12 11:30:59.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,10 +28,13 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = ModifyClass43006 - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/CreateInstance/Makefile.make_install 2005-05-12 11:30:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/CreateInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = CreateInstance53000 \ -@@ -91,4 +93,5 @@ - XMLSCRIPTS += CreateInstance53001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ProcessIndication/Makefile.make_install 2005-05-12 11:31:00.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ProcessIndication/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,7 @@ - JAVAROOT = ../../../../.. - ROOT = ../../../../../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/mak/program.mak - ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstances/Makefile.make_install 2005-05-12 11:30:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = EnumerateInstances51003 -@@ -63,4 +65,5 @@ - XmlScriptDefects: DeepLocalFT51006 \ - DeepLocalTT51004 - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/GetInstance/Makefile.make_install 2005-05-12 11:30:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/GetInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = GetInstance52000 GetInstance52001 GetInstance52002 GetInstance52003 GetInstance52005 GetInstance52006 -@@ -42,4 +44,5 @@ - XMLSCRIPTS += GetInstance52004 - endif - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Makefile.make_install 2005-05-12 11:30:59.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT=../../../../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/test/config.mak - - DIRS = \ -@@ -50,5 +52,6 @@ - # DeleteClass - # Headers\ - -+TEST=true - include $(ROOT)/mak/recurse.mak - ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyInstance/Makefile.make_install 2005-05-12 11:31:00.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = ModifyInstance54000 ModifyInstance54003 ModifyInstance54004 ModifyInstance54005 ModifyInstance54006 -@@ -40,4 +42,5 @@ - ModifyInstance54002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ErrorXml/Makefile.make_install 2005-05-12 11:30:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ErrorXml/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,11 +28,14 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = BadAttributeName01 BadBooleanValue01 BadInstanceClassName01 BadMethodName01 BadQualDecl01 BadQualDeclType01 DuplicateProperty01 DuplicateQualifier01 MissingBooleanValue01 MissingCIMEndTag01 MissingClassName01 MissingClassNameStartTag01 MissingIParamvalueEndTag01 MissingIParamvalueStartTag01 MissingKeyValue01 MissingKeyValueEndTag01 MissingMessageEndTag01 MissingMethodCallEndTag01 MissingPropertyReferenceEndTag01 MissingReqEndTag01 MissingValueArray01 MissingXmlVersion01 BadChar16Value01 BadDateTimeValue01 BadOpeningElement01 BadQualValueElement01 BadReal32Value01 BadReal64Value01 IllegalValueClassName01 MissingInstanceNameClassName01 MissingParamValueName01 MissingValueElementEndTag01 BadCharacterReference01 BadCharacterReference02 BadCharacterReference03 BadCharacterReference04 BadCharacterReference05 BadCharacterReference06 BadCharacterReference07 BadEntityReference01 BadEntityReference02 BadEntityReference03 GoodCharacterReference01 GoodCharacterReference02 GoodCharacterReference03 GoodCharacterReference04 GoodEntityReference01 - - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Client/Makefile.make_install 2005-05-12 11:30:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Client/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,7 @@ - JAVAROOT = ../../../../.. - ROOT = ../../../../../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - .SUFFIXES: .java .class .jar ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/JMPI_TestPropertyTypes/Makefile.make_install 2005-05-12 11:30:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/JMPI_TestPropertyTypes/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,7 @@ - JAVAROOT = ../../../../.. - ROOT = ../../../../../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - .SUFFIXES: .java .class .jar ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Load/Makefile.make_install 2005-05-22 17:50:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,7 +34,9 @@ - # remove function. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # The following variable determine the version of the Schema to ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstanceNames/Makefile.make_install 2005-05-12 11:30:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstanceNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - ROOT = ../../../../../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = EnumerateInstanceNames50000 EnumerateInstanceNames50002 -@@ -38,4 +40,5 @@ - XMLSCRIPTS += EnumerateInstanceNames50001 - endif - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/DeleteInstance/Makefile.make_install 2005-05-12 11:30:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/DeleteInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = DeleteInstance55000 DeleteInstance55001 DeleteInstance55003 -@@ -39,4 +41,5 @@ - DeleteInstance55002 - endif - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/InvokeMethod/Makefile.make_install 2005-05-12 11:30:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/InvokeMethod/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = MethodCall1000 -@@ -39,4 +41,5 @@ - # DeleteInstance55002 - #endif - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Headers/Makefile.make_install 2005-05-12 11:30:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Headers/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,11 +28,14 @@ - #//============================================================================== - - ROOT = ../../../../../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak - #include $(ROOT)/test/config.mak -+TEST=true - include ../config.mak - - XMLSCRIPTS = BadCIMMethodValue01 BadCIMMethodValue02 BadCIMObjectValue01 BadCIMObjectValue02 BadCIMObjectValue03 BadCIMObjectValue04 BadCIMOperationValue01 BadCIMProtocolVersionValue01 ExtraCIMBatchTag01 ExtraCIMBatchTag02 MissingCIMBatchTag01 MissingCIMMethodTag01 MissingCIMMethodTag02 MissingCIMObjectTag01 MissingCIMObjectTag02 MissingCIMOperationTag01 MissingCIMOperationTag02 UnsupportedCIMProtocolVersionValue01 UnsupportedCIMVersionValue01 UnsupportedDTDVersionValue01 UnsupportedHTTPMethod01 MissingCIMMethodValue01 MissingCIMProtocolVersion01 MissingMessage01 BadCIMMethodValue03 BadCIMMethodValueEncoding01 BadCIMObjectValueEncoding01 BadCIMObjectValueEncoding02 BadCIMObjectValueEncoding03 GoodCIMObjectValueEncoding01 - - -+TEST=true - include $(ROOT)/test/configend.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderModule/Makefile.make_install 2005-05-12 11:30:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderModule/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/Default/tests/ProviderModule -@@ -45,6 +46,7 @@ - - SOURCES = ProviderModule.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/Makefile.make_install 2005-05-12 11:30:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ -@@ -34,4 +35,5 @@ - ProviderModule \ - ResponseHandler - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderFacade/Makefile.make_install 2005-05-12 11:30:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderFacade/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/Default/tests/ProviderFacade -@@ -42,6 +43,7 @@ - - SOURCES = ProviderFacade.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderManager/Makefile.make_install 2005-05-12 11:30:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/Default/tests/ProviderManager -@@ -45,6 +46,7 @@ - - SOURCES = ProviderManager.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler/Makefile.make_install 2005-05-12 11:30:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Pegasus/ProviderManager2/Default/tests/ResponseHandler -@@ -43,6 +44,7 @@ - - SOURCES = TestResponseHandler.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/Repository2/Makefile.make_install 2005-06-01 17:13:16.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/Repository2/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/Repository2 -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -56,6 +58,7 @@ - PROGRAM = Repository2 - SOURCES = Repository2.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: testxml testbin ---- pegasus-2.5/src/Pegasus/Repository/tests/LoadClass/Makefile.make_install 2005-05-12 11:31:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/LoadClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/LoadClass -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = LoadClass - SOURCES = LoadClass.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/EnumerateClassNames/Makefile.make_install 2005-05-23 17:07:31.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/EnumerateClassNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/EnumerateClassNames -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = EnumerateClassNames - SOURCES = EnumerateClassNames.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - ---- pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlBin/Makefile.make_install 2005-05-23 17:07:30.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlBin/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -48,6 +48,7 @@ - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/CompareXmlBin - -+TEST=true - include $(ROOT)/mak/config.mak - ### include ../libraries.mak - -@@ -211,5 +212,5 @@ - @ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repositoryServer REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_XML) REPOSITORY_MODE=XML - @ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repository REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_BIN) REPOSITORY_MODE=BIN - -- -+install: - ---- pegasus-2.5/src/Pegasus/Repository/tests/Repository/Makefile.make_install 2005-05-23 17:07:32.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/Repository/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/Repository -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = Repository - SOURCES = Repository.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: testxml testbin ---- pegasus-2.5/src/Pegasus/Repository/tests/RepositoryMix/Makefile.make_install 2005-05-23 17:07:33.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/RepositoryMix/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/RepositoryMix -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = RepositoryMix - SOURCES = RepositoryMix.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: testxml testbin testbinmix testxmlmix ---- pegasus-2.5/src/Pegasus/Repository/tests/Makefile.make_install 2005-05-13 19:04:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - # -@@ -56,4 +57,5 @@ - LoadClass \ - CompareXmlCompressed - -+TEST=true - include ../../../../mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Repository/tests/Inst/Makefile.make_install 2005-05-12 11:31:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/Inst/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/Inst -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = Inst - SOURCES = Inst.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/QualifierDeclRep/Makefile.make_install 2005-05-23 17:07:31.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/QualifierDeclRep/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/QualifierDeclRep -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = QualifierDeclRep - SOURCES = QualifierDeclRep.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: testxml testbin ---- pegasus-2.5/src/Pegasus/Repository/tests/NameSpaceManager/Makefile.make_install 2005-05-17 17:54:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/NameSpaceManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/NameSpaceManager -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = NameSpaceManager - SOURCES = NameSpaceManager.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/InheritanceTree/Makefile.make_install 2005-05-12 11:31:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/InheritanceTree/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/InheritanceTree -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = InheritanceTree - SOURCES = InheritanceTree.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/NameSpace/Makefile.make_install 2005-05-23 17:07:31.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/NameSpace/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/NameSpace -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = NameSpace - SOURCES = NameSpace.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: testxml testbin ---- pegasus-2.5/src/Pegasus/Repository/tests/LoadRepository/Makefile.make_install 2005-05-17 17:54:45.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/LoadRepository/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/LoadRepository -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = LoadRepository.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/SharedNameSpace/Makefile.make_install 2005-05-23 17:07:33.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/SharedNameSpace/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/SharedNameSpace -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = SharedNameSpace - SOURCES = SharedNameSpace.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: testxml testbin ---- pegasus-2.5/src/Pegasus/Repository/tests/SharedInheritanceTree/Makefile.make_install 2005-05-17 17:54:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/SharedInheritanceTree/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/SharedInheritanceTree -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = SharedInheritanceTree - SOURCES = SharedInheritanceTree.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/AssocTable/Makefile.make_install 2005-05-12 11:31:06.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/AssocTable/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/AssocTable -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = AssocTable - SOURCES = AssocTable.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlCompressed/Makefile.make_install 2005-05-12 11:31:47.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlCompressed/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -49,6 +49,7 @@ - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/$(TESTNAME) - -+TEST=true - include $(ROOT)/mak/config.mak - ### include ../libraries.mak - -@@ -202,5 +203,5 @@ - @ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repositoryServer REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_XML) REPOSITORY_MODE=XML PEGASUS_ENABLE_COMPRESSED_REPOSITORY=build_non_compressed - @ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repository REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_CMP) REPOSITORY_MODE=XML - -- -+install: - ---- pegasus-2.5/src/Pegasus/Repository/tests/ClassDeclRep/Makefile.make_install 2005-05-23 17:07:30.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/ClassDeclRep/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/ClassDeclRep -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - SOURCES = ClassDeclRep.cpp - POST_LIBRARIES = -L$(ROOT)/src/PegasusRepository -lPegasusRepository - -+TEST=true - include $(ROOT)/mak/program.mak - - ---- pegasus-2.5/src/Pegasus/Repository/tests/CompareRepositories/Makefile.make_install 2005-05-12 11:31:07.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Repository/tests/CompareRepositories/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - ROOT = ../../../../.. - DIR = Pegasus/Repository/tests/CompareRepositories - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -38,6 +40,7 @@ - PROGRAM = CompareRepositories - SOURCES = CompareRepositories.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - .PHONY: FORCE local-clean tests poststarttests ---- pegasus-2.5/src/Pegasus/IndicationService/tests/Subscription/Makefile.make_install 2005-05-12 11:30:38.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/IndicationService/tests/Subscription/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/IndicationService/tests/Subscription -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = Subscription.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile.make_install 2005-08-09 16:51:21.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/IndicationService/tests/ProcessIndication -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -43,6 +45,7 @@ - LOCAL_DEFINES = -DINDICATION_DIR="""$(DISPLAYCONSUMER_DIR)""" -DPEGASUS_INTERNALONLY - endif - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/IndicationService/tests/Makefile.make_install 2005-05-12 11:30:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/IndicationService/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ -@@ -37,4 +38,5 @@ - ProcessIndication \ - Subscription - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/IndicationService/tests/IndicationProcess/Makefile.make_install 2005-05-12 11:30:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/IndicationService/tests/IndicationProcess/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/IndicationService/tests/IndicationProcess -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -43,6 +45,7 @@ - LOCAL_DEFINES = -DINDICATION_DIR="""$(DISPLAYCONSUMER_DIR)""" -DPEGASUS_INTERNALONLY - endif - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile.make_install 2005-08-09 16:51:20.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/IndicationService/tests/DisableEnable2 -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = DisableEnable2.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable/Makefile.make_install 2005-08-09 16:51:20.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/IndicationService/tests/DisableEnable -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = DisableEnable.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/CQL/tests/Queries/Makefile.make_install 2005-05-12 11:28:35.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/CQL/tests/Queries/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - - ROOT = ../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - # Steps to add a testcase: -@@ -153,3 +155,4 @@ - - general: - -+install: -\ No newline at end of file ---- pegasus-2.5/src/Pegasus/CQL/tests/RegularExpression/Makefile.make_install 2005-05-12 11:28:36.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/CQL/tests/RegularExpression/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,7 @@ - ROOT = ../../../../.. - DIR = Pegasus/CQL/tests/RegularExpression - #DIRS = msg -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -43,6 +44,7 @@ - PROGRAM = RegularExpression - SOURCES = RegularExpression.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/CQL/tests/CQLChainedIdentifier/Makefile.make_install 2005-05-12 11:28:34.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/CQL/tests/CQLChainedIdentifier/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - - #DIRS = msg - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -45,6 +46,7 @@ - SOURCES = CQLChainedIdentifier.cpp - - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/CQL/tests/Makefile.make_install 2005-05-12 11:28:35.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/CQL/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ -@@ -35,4 +36,5 @@ - CQLValue \ - Queries - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/CQL/tests/CQLValue/Makefile.make_install 2005-05-12 11:28:35.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/CQL/tests/CQLValue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - - #DIRS = msg - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -47,6 +48,7 @@ - SOURCES = CQLValue.cpp - - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/CQL/tests/QueryContext/Makefile.make_install 2005-05-12 11:28:36.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/CQL/tests/QueryContext/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - - #DIRS = msg - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -47,6 +48,7 @@ - PROGRAM = TestQueryContext - SOURCES = TestQueryContext.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Consumer/tests/Makefile.make_install 2005-05-12 11:29:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Consumer/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - DisplayConsumer - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Consumer/tests/DisplayConsumer/Makefile.make_install 2005-05-12 11:29:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Consumer/tests/DisplayConsumer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,10 +28,12 @@ - #//============================================================================== - ROOT = ../../../../.. - -+TEST=true - include ../libraries.mak - - DIR = Pegasus/Consumer/tests/DisplayConsumer - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - LIBRARY = DisplayConsumer - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/tests/Makefile.make_install 2005-05-12 11:31:59.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames/Makefile.make_install 2005-05-12 11:31:59.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = wildCardNamespaceNames.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/load/Makefile.make_install 2005-05-24 16:49:01.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,6 +34,7 @@ - # remove function. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak - - REPOSITORYDIR = $(TMP_DIR) ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider/Makefile.make_install 2005-05-12 11:31:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = lookupMethodProvider.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/Makefile.make_install 2005-05-12 11:31:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -40,4 +40,5 @@ - - # lookupIndicationProvider \ - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider/Makefile.make_install 2005-05-12 11:31:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = lookupInstanceProvider.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider/Makefile.make_install 2005-05-12 11:31:58.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = lookupIndicationProvider.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances/Makefile.make_install 2005-05-12 11:31:59.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = modifyInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances/Makefile.make_install 2005-05-12 11:31:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = deleteInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/createInstances/Makefile.make_install 2005-05-12 11:31:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/createInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Server/ProviderRegistrationManager/tests/createInstances -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = createInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ExportServer/tests/Makefile.make_install 2005-05-12 11:29:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ExportServer/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - # ExportServer - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/ExportServer/tests/ExportServer/Makefile.make_install 2005-05-12 11:29:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ExportServer/tests/ExportServer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/ExportServer/tests/ExportServer -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestExportServer - SOURCES = ExportServer.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ExportServer/tests/HandlerTable/Makefile.make_install 2005-05-12 11:29:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ExportServer/tests/HandlerTable/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/ExportServer/tests/HandlerTable -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = HandlerTable.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/DynListener/tests/Makefile.make_install 2005-05-12 11:29:51.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/DynListener/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - TestDynListener - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/DynListener/tests/TestDynListener/Makefile.make_install 2005-05-12 11:29:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/DynListener/tests/TestDynListener/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/DynListener/tests/TestDynListener -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -DPEGASUS_CONSUMER_INTERNAL -@@ -36,6 +38,7 @@ - PROGRAM = TestDynListener - SOURCES = TestListener.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Config/tests/ConfigManager/Makefile.make_install 2005-05-12 11:29:45.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Config/tests/ConfigManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Config/tests/ConfigManager - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = ConfigManager.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - LOCAL_FILES_TO_CLEAN = \ ---- pegasus-2.5/src/Pegasus/Config/tests/Makefile.make_install 2005-05-12 11:29:45.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Config/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,10 +28,12 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - ConfigFileHandler \ - ConfigManager - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Config/tests/ConfigFileHandler/Makefile.make_install 2005-05-12 11:29:44.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Config/tests/ConfigFileHandler/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Config/tests/ConfigFileHandler - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = ConfigFileHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - LOCAL_FILES_TO_CLEAN = \ ---- pegasus-2.5/src/Pegasus/msg/Listener/Makefile.make_install 2005-05-12 11:32:02.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/msg/Listener/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -50,3 +50,4 @@ - messages: $(MSG_BUNDLES) - - # DO NOT DELETE -+install: ---- pegasus-2.5/src/Pegasus/msg/Server/Makefile.make_install 2005-05-12 11:32:02.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/msg/Server/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -50,3 +50,4 @@ - messages: $(MSG_BUNDLES) - - # DO NOT DELETE -+install: ---- pegasus-2.5/src/Pegasus/msg/CLI/Makefile.make_install 2005-05-12 11:32:02.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/msg/CLI/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -50,3 +50,5 @@ - messages: $(MSG_BUNDLES) - - # DO NOT DELETE -+ -+install: ---- pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthFile/Makefile.make_install 2005-05-12 11:31:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthFile/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Security/Authentication/tests/LocalAuthFile - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = LocalAuthFile.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Security/Authentication/tests/Makefile.make_install 2005-05-12 11:31:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT=../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ -@@ -36,4 +37,5 @@ - BasicAuthenticationHandler \ - AuthenticationManager - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Security/Authentication/tests/AuthenticationManager/Makefile.make_install 2005-05-12 11:31:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/AuthenticationManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Security/Authentication/tests/AuthenticationManager - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - -@@ -41,6 +43,7 @@ - - SOURCES = AuthenticationManager.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthenticationHandler/Makefile.make_install 2005-05-12 11:31:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthenticationHandler/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Security/Authentication/tests/LocalAuthenticationHandler - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = LocalAuthenticationHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Security/Authentication/tests/BasicAuthenticationHandler/Makefile.make_install 2005-05-12 11:31:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/BasicAuthenticationHandler/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Security/Authentication/tests/BasicAuthenticationHandler - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = BasicAuthenticationHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Security/UserManager/tests/AuthorizationHandler/Makefile.make_install 2005-05-12 11:31:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/UserManager/tests/AuthorizationHandler/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Security/UserManager/tests/AuthorizationHandler - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - -@@ -41,6 +43,7 @@ - - SOURCES = AuthorizationHandler.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Security/UserManager/tests/Makefile.make_install 2005-05-12 11:31:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/UserManager/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,10 +28,12 @@ - #//============================================================================== - ROOT=../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - UserManager \ - AuthorizationHandler - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Security/UserManager/tests/UserManager/Makefile.make_install 2005-05-12 11:31:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Security/UserManager/tests/UserManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Security/UserManager/tests/UserManager - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = UserManager.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/slp/Makefile.make_install 2005-05-12 11:28:40.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/slp/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - ROOT = $(PEGASUS_ROOT) - DIRCLIENT = Pegasus/Client - DIR = Pegasus/Client/tests/slp -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -42,6 +44,7 @@ - - SOURCES = slpclient.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/InvokeMethod2/Makefile.make_install 2005-05-12 11:28:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/InvokeMethod2/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Client/tests/InvokeMethod2 -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -37,6 +39,7 @@ - - SOURCES = InvokeMethod2.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/SSLClientVerification/Makefile.make_install 2005-05-12 11:28:40.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/SSLClientVerification/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Client/tests/SSLClientVerification -+TEST=true - include $(ROOT)/mak/config.mak - - ifdef PEGASUS_HAS_SSL -@@ -35,6 +36,7 @@ - SYS_INCLUDES += -I$(OPENSSL_HOME)/include - endif - -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -51,7 +53,9 @@ - CURRENT_USER=`whoami` - endif - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/mak/commands.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/MTTestClient/Makefile.make_install 2005-05-12 11:28:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/MTTestClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - PEGASUS_ZOS_PROGRAM_OBJECT = yes - - DIR = Clients/ipinfo -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -42,6 +43,7 @@ - PROGRAM = MTTestClient - SOURCES = MTTestClient.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/Makefile.make_install 2005-05-19 07:37:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../ - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = AssociationClient Client InvokeMethod2 EnumInstances DeleteNamespace ClientStatistics -@@ -39,4 +40,5 @@ - DIRS += $(DIRS_SLP) - endif - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Client/tests/DeleteNamespace/Makefile.make_install 2005-05-12 11:28:38.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/DeleteNamespace/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Client/tests/DeleteNamespace -+TEST=true - include $(ROOT)/mak/config.mak - - ifdef PEGASUS_HAS_SSL -@@ -35,6 +36,7 @@ - SYS_INCLUDES += -I$(OPENSSL_HOME)/include - endif - -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -43,6 +45,7 @@ - - SOURCES = DeleteNamespace.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/ClientStatistics/Makefile.make_install 2005-05-12 11:28:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/ClientStatistics/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Client/tests/ClientStatistics -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) $(ACE_INCLUDES) -@@ -37,6 +39,7 @@ - - SOURCES = ClientStatistics.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/Client/Makefile.make_install 2005-05-12 11:28:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/Client/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Client/tests/Client -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) $(ACE_INCLUDES) -@@ -37,6 +39,7 @@ - - SOURCES = Client.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/EnumInstances/Makefile.make_install 2005-05-12 11:28:38.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/EnumInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Client/tests/EnumInstances -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -37,6 +39,7 @@ - - SOURCES = EnumInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Client/tests/AssociationClient/Makefile.make_install 2005-05-12 11:28:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Client/tests/AssociationClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = $(PEGASUS_ROOT) - DIR = Pegasus/Client/tests/AssociationClient -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -37,6 +39,7 @@ - - SOURCES = AssociationClient.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests/Makefile.make_install 2005-05-12 11:29:49.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Pegasus/ControlProviders/QueryCapabilitiesProvider/tests - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -41,6 +42,7 @@ - PROGRAM = testCIMQueryCap - SOURCES = TestCIMQueryCap.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - CIM_SCHEMA_DIR = $(ROOT)/Schemas/CIMPrelim291 ---- pegasus-2.5/src/Pegasus/ControlProviders/Statistic/test/Makefile.make_install 2005-05-12 11:29:50.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/Statistic/test/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT=$(PEGASUS_ROOT) - DIR = Pegasus/ControlProviders/Statistic/test - include $(ROOT)/mak/config.mak -- -+TEST=true - LIBRARIES = \ - pegclient \ - pegcommon ---- pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/Makefile.make_install 2005-05-12 11:29:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,4 +34,5 @@ - createInstances \ - modifyInstances - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances/Makefile.make_install 2005-05-12 11:29:49.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = modifyInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances/Makefile.make_install 2005-05-12 11:29:49.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -39,6 +41,7 @@ - - SOURCES = createInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ControlProviders/InteropProvider/tests/Makefile.make_install 2005-05-12 11:29:47.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/InteropProvider/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT=$(PEGASUS_ROOT) - DIR = Pegasus/ControlProviders/InteropProvider/tests -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -42,6 +43,7 @@ - PROGRAM = TestInterop - SOURCES = interop.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/ExportClient/tests/Makefile.make_install 2005-05-12 11:29:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ExportClient/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = ExportClient - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/ExportClient/tests/ExportClient/Makefile.make_install 2005-05-12 11:29:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ExportClient/tests/ExportClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/ExportClient/tests/ExportClient -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestExportClient - SOURCES = ExportClient.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/WQL/tests/ExecQuery/Makefile.make_install 2005-05-12 11:32:00.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/WQL/tests/ExecQuery/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,13 +27,16 @@ - #// - #//============================================================================== - ROOT = ../../../../.. -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/src/Pegasus/Client/tests/libraries.mak - - PROGRAM = testExecQuery - - SOURCES = TestExecQuery.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/WQL/tests/ParserCLI/Makefile.make_install 2005-07-29 11:55:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/WQL/tests/ParserCLI/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - - LIBRARIES = pegwql pegcommon pegquerycommon - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -38,6 +39,7 @@ - PROGRAM = TestParserCLI - SOURCES = ParserCLI.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - # Warning: These tests are based on a specific set of paramaters and their ---- pegasus-2.5/src/Pegasus/WQL/tests/Makefile.make_install 2005-05-12 11:32:00.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/WQL/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT=../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ -@@ -39,4 +40,5 @@ - ExecQuery - endif - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/WQL/tests/Parser/Makefile.make_install 2005-05-12 11:32:01.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/WQL/tests/Parser/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - LIBRARIES = pegwql pegcommon pegquerycommon - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -39,6 +40,7 @@ - PROGRAM = TestParser - SOURCES = Parser.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Queries/Makefile.make_install 2005-05-17 13:09:27.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Queries/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,7 +31,9 @@ - DIR = Pegasus/Query/QueryExpression/tests/Queries - - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - QueryExpression.query.res: QueryExpression.query -@@ -49,4 +51,4 @@ - - depend: - -- -+install: ---- pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Makefile.make_install 2005-05-12 11:31:05.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -35,7 +35,9 @@ - EXTRA_INCLUDES = -Int_includes - endif - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - LIBRARIES = \ -@@ -57,6 +59,7 @@ - QEXPRTESTNS=root/SampleProvider - QEXPRTESTNSDIRECTORY=$(REPOSITORY_ROOT)/root\#SampleProvider - -+TEST=true - include $(ROOT)/mak/program.mak - - repository: -@@ -75,3 +78,4 @@ - - clean: - -+install: -\ No newline at end of file ---- pegasus-2.5/src/Pegasus/Common/tests/Property/Makefile.make_install 2005-05-12 11:28:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Property/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Property -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestProperty - SOURCES = Property.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Match/Makefile.make_install 2005-05-12 11:28:50.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Match/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Match -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestMatch - SOURCES = Match.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/IPC/Makefile.make_install 2005-05-12 11:28:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/IPC/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/IPC -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = IPC - SOURCES = IPC.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/WebServer/Makefile.make_install 2005-05-12 11:29:40.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/WebServer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/WebServer -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = WebServer - SOURCES = WebServer.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/ModuleController/Makefile.make_install 2005-05-12 11:28:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ModuleController/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/ModuleController -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = mod_control - SOURCES = mod_control.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/MessageSerializer/Makefile.make_install 2005-05-12 11:28:51.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/MessageSerializer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/MessageSerializer -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestMessageSerializer - SOURCES = MessageSerializer.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/ToMof/Makefile.make_install 2005-05-12 11:29:38.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ToMof/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/ToMof -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = tomof.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Service/BeeperService/Makefile.make_install 2005-05-12 11:28:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Service/BeeperService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Common/tests/Service/BeeperService -+TEST=true - include $(ROOT)/mak/config.mak - LIBRARIES = pegcommon - -@@ -39,6 +40,7 @@ - - SOURCES = BeeperService.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - SERVICE_PATH = e:/tog/pegasus_home/bin/BeeperService.exe ---- pegasus-2.5/src/Pegasus/Common/tests/Service/Makefile.make_install 2005-05-12 11:28:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Service/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - ROOT = ../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = InstallService RemoveService BeeperService - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Common/tests/Service/RemoveService/Makefile.make_install 2005-05-12 11:29:35.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Service/RemoveService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Common/tests/Service/RemoveService -+TEST=true - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -38,6 +39,7 @@ - - SOURCES = RemoveService.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Service/InstallService/Makefile.make_install 2005-05-12 11:28:57.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Service/InstallService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Common/tests/Service/InstallService -+TEST=true - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -38,6 +39,7 @@ - - SOURCES = InstallService.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/ParamValue/Makefile.make_install 2005-05-12 11:28:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ParamValue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/ParamValue -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = ParamValue.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Abstract/Makefile.make_install 2005-05-12 11:28:41.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Abstract/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = $(PEGASUS_ROOT) - DIR = Pegasus/Common/tests/Abstract -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestAbstract - SOURCES = Abstract.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/InstanceDecl/Makefile.make_install 2005-05-12 11:28:49.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/InstanceDecl/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/InstanceDecl -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestInstanceDecl - SOURCES = InstanceDecl.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Resolve/Makefile.make_install 2005-05-12 11:28:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Resolve/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Resolve -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestResolve - SOURCES = Resolve.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/TimeValue/Makefile.make_install 2005-05-12 11:29:38.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/TimeValue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/TimeValue -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestTimeValue - SOURCES = TimeValue.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Dir/Makefile.make_install 2005-05-12 11:28:45.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Dir/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Dir -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestDir - SOURCES = Dir.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/IndicationFormatter/Makefile.make_install 2005-06-20 14:50:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/IndicationFormatter/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -1,6 +1,8 @@ - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/IndicationFormatter -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -8,6 +10,7 @@ - PROGRAM = TestIndicationFormatter - SOURCES = IndicationFormatter.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/XmlParser/Makefile.make_install 2005-05-12 11:29:40.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/XmlParser/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/XmlParser -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestXmlParser - SOURCES = XmlParser.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Formatter/Makefile.make_install 2005-05-12 11:28:47.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Formatter/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Formatter -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestFormatter - SOURCES = Formatter.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Compare/Makefile.make_install 2005-05-12 11:28:44.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Compare/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Compare -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestCompare - SOURCES = Compare.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile.make_install 2005-10-03 12:32:47.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/DynLoad -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestDynLoad - SOURCES = DynLoad.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/QualifierList/Makefile.make_install 2005-05-12 11:28:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/QualifierList/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/QualifierList -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestQualifierList - SOURCES = QualifierList.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Makefile.make_install 2005-06-20 14:50:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ -@@ -91,4 +92,5 @@ - StatisticalData - endif - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Common/tests/Tracer/Makefile.make_install 2005-05-12 11:29:38.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Tracer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Common/tests/Tracer - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = Tracer.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/ObjectNormalizer/Makefile.make_install 2005-05-12 11:28:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ObjectNormalizer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - DIR = Pegasus/Common/tests/ObjectNormalizer - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - PROGRAM = TestObjectNormalizer -@@ -39,6 +41,7 @@ - TestObjectNormalizer.cpp\ - LocalRepository.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Qualifier/Makefile.make_install 2005-05-12 11:28:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Qualifier/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Qualifier -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestQualifier - SOURCES = Qualifier.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/StrToInstName/Makefile.make_install 2005-05-12 11:29:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/StrToInstName/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/StrToInstName -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestStrToInstName - SOURCES = StrToInstName.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Stack/Makefile.make_install 2005-05-12 11:29:36.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Stack/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Stack -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestStack - SOURCES = Stack.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/XmlDump/Makefile.make_install 2005-05-12 11:29:40.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/XmlDump/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/XmlDump -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = XmlDump.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/WebClient/Makefile.make_install 2005-05-12 11:29:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/WebClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/WebClient -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = WebClient - SOURCES = WebClient.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Flavor/Makefile.make_install 2005-05-12 11:28:47.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Flavor/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Flavor -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = Flavor.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/DQueue/Makefile.make_install 2005-05-12 11:28:45.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/DQueue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/DQueue -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = DQueue - SOURCES = DQueue.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Config/Makefile.make_install 2005-05-12 11:28:44.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Config/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Config -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestConfig - SOURCES = Config.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Parameter/Makefile.make_install 2005-05-12 11:28:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Parameter/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Parameter -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestParameter - SOURCES = Parameter.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Thread/Makefile.make_install 2005-05-12 11:29:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Thread/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Thread -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = Thread - SOURCES = Thread.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/DynamicLibrary/Makefile.make_install 2005-05-12 11:28:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/DynamicLibrary/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,10 +26,12 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include ../libraries.mak - - DIR = Pegasus/Common/tests/DynamicLibrary - -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -38,6 +40,7 @@ - - PROGRAM = TestDynamicLibrary - -+TEST=true - include $(PEGASUS_ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/L10N/Makefile.make_install 2005-05-12 11:28:49.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/L10N/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,7 +31,9 @@ - - DIRS = msg - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -39,6 +41,7 @@ - PROGRAM = TestL10N - SOURCES = l10n.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/L10N/msg/Makefile.make_install 2005-05-12 11:28:49.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/L10N/msg/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,12 +30,12 @@ - - DIR = Pegasus/Common/tests/L10N/msg - -+TEST=true - include $(ROOT)/mak/config.mak - - # ICU package name - MSG_PACKAGE = pegasusTest - -- - # Destination directory for the compiled bundles - MSG_DIR = $(MSG_ROOT)/test - -@@ -49,8 +49,10 @@ - - # Keep the following in the order listed - -+TEST=true - include $(ROOT)/mak/message.mak - - messages: $(MSG_BUNDLES) - -+install: - # DO NOT DELETE ---- pegasus-2.5/src/Pegasus/Common/tests/Base64/Makefile.make_install 2005-05-12 11:28:43.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Base64/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Base64 -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestBase64 - SOURCES = Base64.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/async_callback/Makefile.make_install 2005-05-16 13:33:42.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/async_callback/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/async_callback -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestAsyncCallback - SOURCES = async_callback.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/DynLib/Makefile.make_install 2005-05-12 11:28:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/DynLib/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,10 +27,12 @@ - #// - #//============================================================================== - ROOT = ../../../../.. -+TEST=true - include ../libraries.mak - - DIR = Pegasus/Common/tests/DynLib - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -43,6 +45,7 @@ - - LIBRARY = TestDynLib - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Reference/Makefile.make_install 2005-05-12 11:28:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Reference/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Reference -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestReference - SOURCES = Reference.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/HashTable/Makefile.make_install 2005-05-12 11:28:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/HashTable/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/HashTable -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestHashTable - SOURCES = HashTable.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/MessageQueue/Makefile.make_install 2005-05-12 11:28:51.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/MessageQueue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/MessageQueue -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestMessageQueue - SOURCES = MessageQueue.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Value/Makefile.make_install 2005-05-12 11:29:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Value/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Value -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = Value.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/MessageQueueService/Makefile.make_install 2005-05-12 11:28:51.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/MessageQueueService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/MessageQueueService -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = MessageQueueService - SOURCES = MessageQueueService.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Scope/Makefile.make_install 2005-05-12 11:28:56.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Scope/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Scope -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = Scope.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Method/Makefile.make_install 2005-05-12 11:28:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Method/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Method -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestMethod - SOURCES = Method.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/String/Makefile.make_install 2005-05-12 11:29:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/String/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/String -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestString - SOURCES = String.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/AtomicInt/Makefile.make_install 2005-05-12 11:28:43.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/AtomicInt/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/AtomicInt -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestAtomicInt - SOURCES = AtomicInt.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/ValidateClass/Makefile.make_install 2005-05-12 11:29:39.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ValidateClass/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/ValidateClass -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestValidateClass - SOURCES = ValidateClass.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/StatisticalData/Makefile.make_install 2005-05-12 11:29:36.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/StatisticalData/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/StatisticalData -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = StatisticalData.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/FileSystem/Makefile.make_install 2005-05-12 11:28:47.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/FileSystem/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/FileSystem -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestFileSystem - SOURCES = FileSystem.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - LOCAL_FILES_TO_CLEAN = \ ---- pegasus-2.5/src/Pegasus/Common/tests/ClassDecl/Makefile.make_install 2005-05-12 11:28:44.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ClassDecl/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/ClassDecl -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestClassDecl - SOURCES = ClassDecl.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/XmlReader/Makefile.make_install 2005-05-12 11:29:41.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/XmlReader/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/XmlReader -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = XmlReader.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/XmlPrint/Makefile.make_install 2005-05-12 11:29:41.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/XmlPrint/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/XmlPrint -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = XmlPrint.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Object/Makefile.make_install 2005-05-12 11:28:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Object/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Object -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestObject - SOURCES = Object.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/ThreadPool/Makefile.make_install 2005-05-12 11:29:37.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/ThreadPool/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/ThreadPool -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = ThreadPool - SOURCES = ThreadPool.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Queue/Makefile.make_install 2005-05-12 11:28:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Queue/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Queue -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestQueue - SOURCES = Queue.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Parent/Makefile.make_install 2005-05-12 11:28:42.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Parent/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Common/tests/AnonymousPipe/Parent -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -39,6 +40,7 @@ - - SOURCES = AnonymousPipe.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Makefile.make_install 2005-05-12 11:28:42.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,8 +28,10 @@ - #//============================================================================== - ROOT = ../../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = Child Parent - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Child/Makefile.make_install 2005-05-12 11:28:42.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Child/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../../.. - DIR = Pegasus/Common/tests/AnonymousPipe/Child -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -39,6 +40,7 @@ - - SOURCES = Child.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Logger/Makefile.make_install 2005-05-12 11:28:50.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Logger/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Logger -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestLogger - SOURCES = Logger.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/HTTPListener/Makefile.make_install 2005-05-12 11:28:48.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/HTTPListener/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/HTTPListener -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestHTTPListener - SOURCES = HTTPListener.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Stopwatch/Makefile.make_install 2005-05-12 11:29:36.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Stopwatch/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Stopwatch -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestStopwatch - SOURCES = Stopwatch.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/AutoPtr/Makefile.make_install 2005-05-12 11:28:43.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/AutoPtr/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,10 @@ - - DIR = Pegasus/Common/tests/AutoPtr - -+TEST=true - include $(ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -40,6 +42,7 @@ - - SOURCES = TestAutoPtr.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/QualifierDecl/Makefile.make_install 2005-05-12 11:28:54.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/QualifierDecl/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/QualifierDecl -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestQualifierDecl - SOURCES = QualifierDecl.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/DateTime/Makefile.make_install 2005-05-12 11:28:45.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/DateTime/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/DateTime -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -36,6 +38,7 @@ - PROGRAM = TestDateTime - SOURCES = DateTime.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/Array/Makefile.make_install 2005-05-12 11:28:43.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/Array/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,9 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Pegasus/Common/tests/Array -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -37,6 +39,7 @@ - - SOURCES = Array.cpp Str.cpp Int.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Pegasus/Common/tests/OperationContext/Makefile.make_install 2005-05-12 11:28:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/OperationContext/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,8 +26,10 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - -+TEST=true - include ../libraries.mak - - DIR = Pegasus/Common/tests/OperationContext -@@ -38,6 +40,7 @@ - - SOURCES = TestOperationContext.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/SDK/samples/Providers/CMPI/FilesAndDirectories/tests/Makefile.make_install 2005-05-12 11:41:25.000000000 -0400 -+++ pegasus-2.5/src/SDK/samples/Providers/CMPI/FilesAndDirectories/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../ - -+TEST=true - include $(ROOT)/mak/config.mak - - XMLSCRIPTS = \ ---- pegasus-2.5/src/Server/Makefile.make_install 2005-08-19 18:50:20.000000000 -0400 -+++ pegasus-2.5/src/Server/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -100,6 +100,8 @@ - - SOURCES = cimserver.cpp - -+INSTALL_BIN=sbin -+ - include $(ROOT)/mak/program.mak - - ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) -@@ -214,7 +216,7 @@ - stageCIMServerConfigurationFiles: - @$(RM) $(PEGASUS_HOME)/cimserver_planned.conf - @$(COPY) cimserver_planned.conf $(PEGASUS_HOME) -- -+ - install_run: - @$(MAKE) -f $(ROOT)/src/Server/Makefile stageServerSSLFiles-SystemIndependent - @$(MAKE) -f $(ROOT)/src/Server/Makefile stageClientSSLFiles-SystemIndependent -@@ -234,4 +236,3 @@ - else - cimserver - endif -- ---- pegasus-2.5/src/utils/cnv2rootbundle/Makefile.make_install 2005-05-12 11:33:39.000000000 -0400 -+++ pegasus-2.5/src/utils/cnv2rootbundle/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,11 +28,12 @@ - #//============================================================================== - ROOT= ../../.. - DIR = utils/cnv2rootbundle -+ - include $(ROOT)/mak/config.mak - - PROGRAM = cnv2rootbundle - SOURCES = cnv2rootbundle.cpp -- -+PEGASUS_INSTALL= - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/utils/Makefile.make_install 2005-05-12 11:33:39.000000000 -0400 -+++ pegasus-2.5/src/utils/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,7 +27,7 @@ - #// - #//============================================================================== - ROOT=../.. -- -+PEGASUS_INSTALL= - include $(ROOT)/mak/config.mak - - DIRS = stripcrs \ ---- pegasus-2.5/src/utils/mu/tests/Makefile.make_install 2005-05-12 11:33:39.000000000 -0400 -+++ pegasus-2.5/src/utils/mu/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(ROOT)/mak/config.mak - - # Inst \ -@@ -35,4 +36,5 @@ - DIRS = \ - SortCmd - -+TEST=true - include ../../../../mak/recurse.mak ---- pegasus-2.5/src/utils/mu/tests/SortCmd/Makefile.make_install 2005-05-12 11:33:40.000000000 -0400 -+++ pegasus-2.5/src/utils/mu/tests/SortCmd/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,7 @@ - ROOT = ../../../../.. - ## DIR = pegasus/src/utils/mu/tests/SortCmd - -+TEST=true - include $(ROOT)/mak/config.mak - - -@@ -38,6 +39,7 @@ - ## PROGRAM = - ## SOURCES = - -+TEST=true - include $(ROOT)/mak/program.mak - - .PHONY: FORCE local-clean tests poststarttests ---- pegasus-2.5/src/utils/stripcrs/Makefile.make_install 2005-05-12 11:33:40.000000000 -0400 -+++ pegasus-2.5/src/utils/stripcrs/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,11 +28,12 @@ - #//============================================================================== - ROOT= ../../.. - DIR = utils/stripcrs -+ - include $(ROOT)/mak/config.mak - - PROGRAM = stripcrs - SOURCES = stripcrs.cpp -- -+PEGASUS_INSTALL= - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/IndicationConsumer/Makefile.make_install 2005-05-12 11:32:03.000000000 -0400 -+++ pegasus-2.5/src/Providers/IndicationConsumer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,10 +31,12 @@ - - ROOT = ../../.. - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - #Directories to recurse - DIRS = \ - SimpleDisplayConsumer - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/IndicationConsumer/SimpleDisplayConsumer/Makefile.make_install 2005-05-12 11:32:04.000000000 -0400 -+++ pegasus-2.5/src/Providers/IndicationConsumer/SimpleDisplayConsumer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/IndicationConsumer/SimpleDisplayConsumer - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY -DINDICATION_DIR=\"$(DISPLAYCONSUMER_DIR)\" -@@ -52,4 +53,5 @@ - LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DINDICATION_DIR="""$(DISPLAYCONSUMER_DIR)""" -DPEGASUS_INTERNALONLY - endif - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/statistic/Makefile.make_install 2005-05-12 11:41:22.000000000 -0400 -+++ pegasus-2.5/src/Providers/statistic/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/statistic - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = IBM_CIMOMStatDataProvider -@@ -43,4 +44,5 @@ - IBM_CIMOMStatDataProvider.cpp \ - IBM_CIMOMStatDataProviderMain.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak ---- pegasus-2.5/src/Providers/slp/Makefile.make_install 2005-05-12 11:41:22.000000000 -0400 -+++ pegasus-2.5/src/Providers/slp/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - DIR = Providers/slp - - DEFINES += -DPEGASUS_DEBUG -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = SLPProvider -@@ -44,6 +45,7 @@ - SOURCES = \ - SLPProvider.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - #ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU) ---- pegasus-2.5/src/Providers/sample/InstanceProvider/Makefile.make_install 2005-05-12 11:41:18.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/InstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/InstanceProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = SampleInstanceProvider -@@ -43,6 +44,7 @@ - InstanceProviderMain.cpp \ - InstanceProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/SNMPIndicationProvider/Makefile.make_install 2005-05-12 11:41:22.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/SNMPIndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Providers/sample/SNMPIndicationProvider -@@ -41,4 +42,5 @@ - SNMPIndicationProviderMain.cpp \ - SNMPIndicationProvider.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/tests/Makefile.make_install 2005-05-12 11:41:18.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,7 +28,11 @@ - #//============================================================================== - ROOT = $(PEGASUS_ROOT) - -+TEST=true -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true -+TEST=true - include $(ROOT)/test/config.mak - - XMLSCRIPTS = \ -@@ -40,7 +44,10 @@ - ReferenceDirNames12002 \ - PlainFileMethodCall11001 - -+TEST=true -+TEST=true - include $(ROOT)/test/configend.mak - - poststarttests: - -+install: -\ No newline at end of file ---- pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/Makefile.make_install 2005-06-03 20:58:16.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/CMPI/FilesAndDirectories - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -50,6 +51,7 @@ - CWS_DirectoryContainsFile.c \ - cwsutil.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/Makefile.make_install 2005-05-12 11:41:20.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ -@@ -46,4 +47,5 @@ - CMPI/FilesAndDirectories/tests - endif - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/sample/IndicationProvider/Makefile.make_install 2005-05-12 11:41:18.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/IndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Providers/sample/IndicationProvider -@@ -41,4 +42,5 @@ - IndicationProviderMain.cpp \ - IndicationProvider.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/sample/RT_Indication/Makefile.make_install 2005-05-12 11:41:21.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/RT_Indication/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,10 +26,12 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ - RT_IndicationProvider \ - RT_IndicationConsumer - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationProvider/Makefile.make_install 2005-05-12 11:41:21.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Providers/sample/RT_Indication/RT_IndicationProvider -@@ -45,4 +46,5 @@ - RT_IndicationProviderMain.cpp \ - RT_IndicationProvider.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationConsumer/Makefile.make_install 2005-05-12 11:41:21.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationConsumer/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/RT_Indication/RT_IndicationConsumer - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY -@@ -45,6 +46,7 @@ - RT_IndicationConsumerMain.cpp \ - RT_IndicationConsumer.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/Load/Makefile.make_install 2005-05-20 17:48:05.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,7 +34,9 @@ - # remove function. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # Loads the sample MOF into a separate namespace. ---- pegasus-2.5/src/Providers/sample/InstanceQueryProvider/tests/Makefile.make_install 2005-05-12 11:41:19.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/InstanceQueryProvider/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,11 @@ - # Test the Family Provider using the script toosl - - ROOT = $(PEGASUS_ROOT) -+TEST=true -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true -+TEST=true - include $(ROOT)/mak/configschema.mak - - # Loads the sample MOF into a separate namespace. ---- pegasus-2.5/src/Providers/sample/InstanceQueryProvider/Makefile.make_install 2005-05-12 11:41:18.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/InstanceQueryProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/InstanceQueryProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = SampleInstanceQueryProvider -@@ -47,6 +48,7 @@ - InstanceQueryProviderMain.cpp \ - InstanceQueryProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/AssociationProvider/Makefile.make_install 2005-05-12 11:41:17.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/AssociationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/AssociationProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = SampleAssociationProvider -@@ -42,6 +43,7 @@ - AssociationProviderMain.cpp \ - AssociationProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/AssociationProvider/testclient/Makefile.make_install 2005-05-12 11:41:17.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/AssociationProvider/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/AssociationProvider/testclient - -+TEST=true - include $(ROOT)/mak/config.mak - - PROGRAM = AssociationTestClient -@@ -49,6 +50,7 @@ - pegclient \ - pegcommon - -+TEST=true - include $(ROOT)/mak/program.mak - - general: ---- pegasus-2.5/src/Providers/sample/MethodProvider/Makefile.make_install 2005-05-12 11:41:20.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/MethodProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/MethodProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = SampleMethodProvider -@@ -43,6 +44,7 @@ - MethodProviderMain.cpp \ - MethodProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/LocalizedProvider/Makefile.make_install 2005-05-12 11:41:19.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/LocalizedProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/sample/LocalizedProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = SampleLocalizedProvider -@@ -43,6 +44,7 @@ - LocalizedProviderMain.cpp \ - LocalizedProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/sample/LocalizedProvider/msg/Makefile.make_install 2005-05-12 11:41:20.000000000 -0400 -+++ pegasus-2.5/src/Providers/sample/LocalizedProvider/msg/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -33,6 +33,7 @@ - - DIR = Providers/sample/LocalizedProvider/msg - -+TEST=true - include $(ROOT)/mak/config.mak - - # ICU package name for genrb -@@ -52,8 +53,11 @@ - - # Keep the following in the order listed, and at the end of the file - -+TEST=true - include $(ROOT)/mak/message.mak - - messages: $(MSG_BUNDLES) - - # DO NOT DELETE -+ -+install: -\ No newline at end of file ---- pegasus-2.5/src/Providers/ManagedSystem/tests/Makefile.make_install 2005-05-17 12:59:41.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,9 @@ - # wbemexec test associated ManagedSystem - - ROOT = ../../../.. -+TEST=true -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - HOSTNAME = ---- pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/Makefile.make_install 2005-05-17 13:07:57.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,11 @@ - # wbemexec tests for ManagedSystem DNS provider - - ROOT = ../../../../.. -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/test.mak - - HOSTNAME = ---- pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/testclient/Makefile.make_install 2005-05-12 11:32:05.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,12 +32,18 @@ - - DIR = Providers/ManagedSystem/DNSService/tests/testclient - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include ../../../libraries.mak - - PROGRAM = DNSTestClient - SOURCES = DNSTestClient.cpp - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/DNSService/Makefile.make_install 2005-05-12 10:54:39.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/DNSService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -46,6 +46,7 @@ - - DIR = Providers/ManagedSystem/DNSService - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = DNSProvider -@@ -77,6 +78,7 @@ - -lpegcommon \ - -lpegprovider - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/NTPProviderSecurity/Makefile.make_install 2005-05-12 10:54:40.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NTPProviderSecurity/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -37,6 +37,7 @@ - - DIR = Providers/ManagedSystem/NTPProviderSecurity - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = NTPProviderSecurity -@@ -51,6 +52,7 @@ - -lpegcommon \ - -lpegprovider - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/Makefile.make_install 2005-05-12 10:54:39.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -38,6 +38,7 @@ - - ROOT = ../../.. - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - DIRS = \ -@@ -77,5 +78,6 @@ - DNSService/tests/testclient - endif - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak - ---- pegasus-2.5/src/Providers/ManagedSystem/IP/tests/Makefile.make_install 2005-05-17 13:06:18.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/IP/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,11 @@ - # wbemexec tests for ManagedSystem IP provider - - ROOT = ../../../../.. -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/test.mak - - HOSTNAME = -@@ -150,3 +154,4 @@ - - prepend-license: - -+install: ---- pegasus-2.5/src/Providers/ManagedSystem/IP/Makefile.make_install 2005-05-12 10:54:39.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/IP/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -41,6 +41,7 @@ - - DIR = Providers/ManagedSystem/IP - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = IPProviderModule -@@ -67,6 +68,7 @@ - EXTRA_LIBRARIES += -lnm - endif - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/IP/testclient/Makefile.make_install 2005-05-12 11:32:05.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/IP/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,13 +32,16 @@ - - DIR = Providers/ManagedSystem/IP/testclient - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include ../../libraries.mak - - PROGRAM = IPTestClient - SOURCES = IPTestClient.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/tests/Makefile.make_install 2005-05-12 10:54:38.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -41,6 +41,8 @@ - - DIR = Providers/ManagedSystem/ComputerSystem/tests - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - PROGRAM = CSProviderTestClient -@@ -62,6 +64,8 @@ - pegconfig \ - pegcommon - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - ifeq ($(OS),VMS) ---- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/Makefile.make_install 2005-05-12 10:54:38.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -41,6 +41,7 @@ - - DIR = Providers/ManagedSystem/ComputerSystem - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = ComputerSystemProvider -@@ -57,6 +58,7 @@ - pegclient \ - pegcommon - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/Processor/tests/Makefile.make_install 2005-05-12 10:54:42.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/Processor/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -42,6 +42,8 @@ - - DIR = Providers/ManagedSystem/Processor/tests - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - PROGRAM = ProcessorProviderTestClient -@@ -62,6 +64,8 @@ - pegclient \ - pegcommon - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - ifeq ($(OS),VMS) ---- pegasus-2.5/src/Providers/ManagedSystem/Processor/Makefile.make_install 2005-05-12 10:54:42.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/Processor/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -42,6 +42,7 @@ - - DIR = Providers/ManagedSystem/Processor - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = ProcessorProviderModule -@@ -58,6 +59,7 @@ - pegclient \ - pegcommon - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - general: ---- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/Makefile.make_install 2005-05-17 13:01:10.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,11 @@ - # wbemexec test associated ManagedSystem - - ROOT = ../../../../.. -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/test.mak - - HOSTNAME = -@@ -117,3 +121,4 @@ - - prepend-license: - -+install: -\ No newline at end of file ---- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/Makefile.make_install 2005-05-12 11:32:07.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,8 @@ - - DIR = Providers/ManagedSystem/OperatingSystem/tests/OSTestClient - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -41,6 +43,8 @@ - PROGRAM = OSTestClient - SOURCES = OSTestClient.cpp - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/Makefile.make_install 2005-05-12 10:54:41.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -40,6 +40,7 @@ - - DIR = Providers/ManagedSystem/OperatingSystem - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = OSProvider -@@ -58,6 +59,7 @@ - -lpegcommon \ - -lpegprovider - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/NISServerService/tests/Makefile.make_install 2005-05-17 13:04:38.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NISServerService/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,11 @@ - # wbemexec tests for ManagedSystem NIS provider - - ROOT = ../../../../.. -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/test.mak - - HOSTNAME = ---- pegasus-2.5/src/Providers/ManagedSystem/NISServerService/Makefile.make_install 2005-05-12 10:54:40.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NISServerService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -41,6 +41,7 @@ - - DIR = Providers/ManagedSystem/NISServerService - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = NISProvider -@@ -65,6 +66,7 @@ - -lpegcommon \ - -lpegprovider - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/NISServerService/testclient/Makefile.make_install 2005-05-12 11:32:06.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NISServerService/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,12 +32,15 @@ - - DIR = Providers/ManagedSystem/NISServerService/testclient - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/src/Clients/libraries.mak - - PROGRAM = NISTestClient - SOURCES = NISTestClient.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/NTPService/tests/Makefile.make_install 2005-05-17 13:02:42.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NTPService/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,11 @@ - # wbemexec tests for ManagedSystem NTP provider - - ROOT = ../../../../.. -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/test.mak - - HOSTNAME = ---- pegasus-2.5/src/Providers/ManagedSystem/NTPService/Makefile.make_install 2005-05-12 10:54:40.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NTPService/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -38,6 +38,7 @@ - - DIR = Providers/ManagedSystem/NTPService - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = NTPProvider -@@ -71,6 +72,7 @@ - -lpegprovider \ - -lNTPProviderSecurity - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/NTPService/testclient/Makefile.make_install 2005-05-12 11:32:06.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/NTPService/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,12 +32,15 @@ - - DIR = Providers/ManagedSystem/NTPService/testclient - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include ../../libraries.mak - - PROGRAM = NTPTestClient - SOURCES = NTPTestClient.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/ManagedSystem/Process/tests/Makefile.make_install 2005-05-12 10:54:41.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/Process/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -42,6 +42,8 @@ - - DIR = Providers/ManagedSystem/Process/tests - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - PROGRAM = ProcessProviderTestClient -@@ -62,6 +64,8 @@ - pegclient \ - pegcommon - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - ifeq ($(OS),VMS) ---- pegasus-2.5/src/Providers/ManagedSystem/Process/Makefile.make_install 2005-05-12 10:54:41.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/Process/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -42,6 +42,7 @@ - - DIR = Providers/ManagedSystem/Process - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = ProcessProvider -@@ -59,6 +60,7 @@ - pegclient \ - pegcommon - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/dynamic-library.mak - - general: ---- pegasus-2.5/src/Providers/Makefile.make_install 2005-05-12 11:32:04.000000000 -0400 -+++ pegasus-2.5/src/Providers/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,7 @@ - # This makefile simply recurses all of the toplevel provider directories - - ROOT = ../.. -- -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - #Directories to recurse -@@ -40,11 +40,11 @@ - sample \ - TestProviders \ - IndicationConsumer -- -- -+ - ifdef PEGASUS_ENABLE_SLP - DIRS += \ - slp - endif - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/linux/load/Makefile.make_install 2005-05-12 10:54:51.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,7 +34,9 @@ - # Makefile loads the Linux_CDROMDrive provider - - ROOT = ../../../.. -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/configschema.mak - - MOF_PATH = . ---- pegasus-2.5/src/Providers/linux/Interrupt/Makefile.make_install 2005-05-12 10:54:44.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/Interrupt/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -46,6 +46,7 @@ - - DIR = Providers/linux/Interrupt - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxInterruptProvider -@@ -71,6 +72,7 @@ - -lDeviceLocator \ - -lFileReader - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/CDROMDrive/Makefile.make_install 2005-05-12 10:54:43.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/CDROMDrive/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -44,6 +44,7 @@ - - DIR = Providers/linux/CDROMDrive - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxCDROMDriveProvider -@@ -69,6 +70,7 @@ - -lDeviceLocator \ - -lFileReader - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/NetworkAdapter/Makefile.make_install 2005-05-12 10:54:45.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/NetworkAdapter/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -45,6 +45,7 @@ - - DIR = Providers/linux/NetworkAdapter - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxNetworkAdapterProvider -@@ -68,6 +69,7 @@ - -lNetworkAdapterData \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/SoftwareElement/Makefile.make_install 2005-05-12 10:54:50.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/SoftwareElement/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -45,6 +45,7 @@ - - DIR = Providers/linux/SoftwareElement - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxSoftwareElementProvider -@@ -67,6 +68,7 @@ - -lpegprovider \ - -lPackageManagerData - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/Makefile.make_install 2005-05-12 10:54:44.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -40,6 +40,7 @@ - - ROOT = ../../.. - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - DIRS = ProviderSupport \ -@@ -55,5 +56,6 @@ - PCIController \ - CDROMDrive - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak - ---- pegasus-2.5/src/Providers/linux/DiskDrive/Makefile.make_install 2005-05-12 10:54:43.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/DiskDrive/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -45,6 +45,7 @@ - - DIR = Providers/linux/DiskDrive - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxDiskDriveProvider -@@ -70,6 +71,7 @@ - -lDeviceLocator \ - -lFileReader - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/Processor/Makefile.make_install 2005-05-12 10:54:46.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/Processor/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -45,6 +45,7 @@ - - DIR = Providers/linux/Processor - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxProcessorProvider -@@ -70,6 +71,7 @@ - -lDeviceLocator \ - -lFileReader - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/IOPort/Makefile.make_install 2005-05-12 10:54:43.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/IOPort/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -45,6 +45,7 @@ - - DIR = Providers/linux/IOPort - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxIOPortProvider -@@ -66,6 +67,7 @@ - -lpegprovider \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/ProviderData/PackageManager/Makefile.make_install 2005-05-12 10:54:48.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/PackageManager/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/PackageManager - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) -@@ -56,5 +57,6 @@ - SOURCES = DebianPackageManagerData.cpp \ - DebianPackageInformation.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/ProviderData/Interrupt/Makefile.make_install 2005-05-12 10:54:47.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/Interrupt/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/Interrupt - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \ -@@ -61,5 +62,6 @@ - DYNAMIC_LIBRARIES = \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/ProviderData/CDROMDrive/Makefile.make_install 2005-05-12 10:54:46.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/CDROMDrive/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/CDROMDrive - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \ -@@ -61,5 +62,6 @@ - DYNAMIC_LIBRARIES = \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/ProviderData/NetworkAdapter/Makefile.make_install 2005-05-12 10:54:48.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/NetworkAdapter/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/NetworkAdapter - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \ -@@ -58,5 +59,6 @@ - SOURCES = NetworkAdapterData.cpp \ - EthernetAdapterData.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/ProviderData/Makefile.make_install 2005-05-12 10:54:47.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -41,6 +41,7 @@ - - ROOT = ../../../.. - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - #Directories to recurse -@@ -52,5 +53,6 @@ - Interrupt \ - Controller - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak - ---- pegasus-2.5/src/Providers/linux/ProviderData/DiskDrive/Makefile.make_install 2005-05-12 10:54:47.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/DiskDrive/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/DiskDrive - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \ -@@ -62,5 +63,6 @@ - DYNAMIC_LIBRARIES = \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/ProviderData/Processor/Makefile.make_install 2005-05-12 10:54:48.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/Processor/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/Processor - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \ -@@ -62,4 +63,5 @@ - DYNAMIC_LIBRARIES = \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak ---- pegasus-2.5/src/Providers/linux/ProviderData/Controller/Makefile.make_install 2005-05-12 10:54:46.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderData/Controller/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,7 @@ - - DIR = Providers/linux/ProviderData/Controller - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \ -@@ -56,5 +57,6 @@ - - SOURCES = PCIControllerData.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/PCIController/Makefile.make_install 2005-05-12 10:54:45.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/PCIController/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -46,6 +46,7 @@ - - DIR = Providers/linux/PCIController - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxPCIControllerProvider -@@ -72,6 +73,7 @@ - -lDeviceLocator \ - -lFileReader - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/OperatingSystem/Makefile.make_install 2005-05-12 10:54:45.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/OperatingSystem/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -44,6 +44,7 @@ - - DIR = Providers/linux/OperatingSystem - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxOperatingSystemProvider -@@ -64,6 +65,7 @@ - -lpegcommon \ - -lpegprovider - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/tests/Makefile.make_install 2005-05-12 10:54:49.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -39,7 +39,11 @@ - ROOT = ../../../../../.. - DIR = Providers/linux/ProviderSupport/DeviceLocator/tests - PEGASUS_DEBUG = 1 -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include libraries.mak - - PROVIDERINCLUDE_ROOT = $(ROOT)/src/Providers/linux/Include -@@ -50,6 +54,8 @@ - - SOURCES = BusScanners.cpp - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/Makefile.make_install 2005-05-12 10:54:49.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -50,6 +50,7 @@ - - DIR = Providers/linux/ProviderSupport/DeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -I$(PROVIDERSUPPORT_ROOT)/FileReader -I$(PROVIDERINCLUDE_ROOT) -@@ -79,4 +80,5 @@ - DYNAMIC_LIBRARIES = \ - -lFileReader - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak ---- pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/tests/Makefile.make_install 2005-05-12 10:54:50.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -40,7 +40,11 @@ - ROOT = ../../../../../.. - DIR = Providers/linux/ProviderSupport/FileReader/tests - PEGASUS_DEBUG = 1 -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) $(ACE_INCLUDES) -I.. -@@ -49,6 +53,8 @@ - - SOURCES = ScannerTests.cpp - -+TEST=true -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/Makefile.make_install 2005-05-12 10:54:49.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -48,6 +48,7 @@ - - #LOCAL_DEFINES = -ggdb - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - EXTRA_INCLUDES = -I.. -@@ -58,5 +59,6 @@ - StreamScanner.cpp \ - ExecScanner.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - ---- pegasus-2.5/src/Providers/linux/ProviderSupport/Makefile.make_install 2005-05-12 10:54:50.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/ProviderSupport/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -43,6 +43,7 @@ - - ROOT = ../../../.. - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - #Directories to recurse -@@ -51,4 +52,5 @@ - DeviceLocator/tests \ - FileReader/tests - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/linux/IPRoute/Makefile.make_install 2005-05-12 10:54:44.000000000 -0400 -+++ pegasus-2.5/src/Providers/linux/IPRoute/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -45,6 +45,7 @@ - - DIR = Providers/linux/IPRoute - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - LIBRARY = LinuxIPRouteProvider -@@ -66,6 +67,7 @@ - -lpegprovider \ - -lDeviceLocator - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/generic/Makefile.make_install 2005-05-12 11:41:16.000000000 -0400 -+++ pegasus-2.5/src/Providers/generic/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - ROOT = ../../.. - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/config.mak - - # removed _NamespaceProvider -@@ -37,4 +38,5 @@ - DIRS = \ - OperatingSystemProvider - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/generic/OperatingSystemProvider/Makefile.make_install 2005-05-12 11:41:16.000000000 -0400 -+++ pegasus-2.5/src/Providers/generic/OperatingSystemProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Providers/generic/OperatingSystemProvider -@@ -41,4 +42,5 @@ - OperatingSystemProvider.cpp \ - OperatingSystemProviderMain.cpp - -+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers - include $(ROOT)/mak/library.mak ---- pegasus-2.5/src/Providers/TestProviders/InstanceProvider/Makefile.make_install 2005-05-12 11:41:12.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/InstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/InstanceProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = TestInstanceProvider -@@ -42,6 +43,7 @@ - TestInstanceProviderMain.cpp \ - TestInstanceProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/InstanceProvider/testclient/Makefile.make_install 2005-05-12 11:41:13.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/InstanceProvider/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - DIR = Providers/TestProviders/InstanceProvider/testclient - -+TEST=true - include $(ROOT)/mak/config.mak - - #LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -46,6 +47,7 @@ - - SOURCES = TestInstanceProviderClient.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/Makefile.make_install 2005-05-12 11:41:14.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/MethodTestProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = MethodTestProvider -@@ -43,4 +44,5 @@ - MethodTestProviderMain.cpp \ - MethodTestProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/testclient/Makefile.make_install 2005-05-12 11:41:14.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - DIR = Providers/TestProviders/MethodTestProvider/testclient - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -46,6 +47,7 @@ - - SOURCES = TestMethodTestProvider.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/AssociationTests/Tests/Makefile.make_install 2005-05-12 11:32:09.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/AssociationTests/Tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -63,6 +63,7 @@ - - DIR = Providers/TestProviders/AssociationTests/Tests - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -79,6 +80,7 @@ - pegcommon \ - pegclient - -+TEST=true - include $(ROOT)/mak/program.mak - - general: ---- pegasus-2.5/src/Providers/TestProviders/AssociationTests/Makefile.make_install 2005-03-07 20:08:23.000000000 -0500 -+++ pegasus-2.5/src/Providers/TestProviders/AssociationTests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -2,6 +2,7 @@ - - DIR = Providers/AssociationTest/AssociationTestProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = AssociationTestProvider -@@ -14,6 +15,7 @@ - AssociationTestProviderMain.cpp \ - AssociationTestProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/tests/Makefile.make_install 2005-07-01 17:54:24.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,6 +27,7 @@ - #// - #//============================================================================== - ROOT = ../../../../../../ -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -41,7 +42,9 @@ - - PROGRAM = TestCMPI_Fail_1 - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/Makefile.make_install 2005-06-24 15:57:38.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -46,6 +47,7 @@ - SOURCES = \ - cmpiTestFail_1Provider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/tests/Makefile.make_install 2005-07-01 17:54:25.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,6 +27,7 @@ - #// - #//============================================================================== - ROOT = ../../../../../../ -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -41,7 +42,9 @@ - - PROGRAM = TestCMPI_Fail_3 - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/Makefile.make_install 2005-06-24 15:57:40.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -46,6 +47,7 @@ - SOURCES = \ - cmpiTestFail_3Provider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/tests/Makefile.make_install 2005-07-01 17:54:26.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,6 +27,7 @@ - #// - #//============================================================================== - ROOT = ../../../../../../ -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -44,7 +45,9 @@ - - PROGRAM = TestCMPIMethod - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - LOGFILES = TestCMPIMethod ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/Makefile.make_install 2005-07-22 16:51:42.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - DIR = Providers/TestProviders/CMPI/TestMethod - - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -47,6 +48,7 @@ - SOURCES = \ - cmpiTestMethodProvider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/tests/Makefile.make_install 2005-05-12 11:41:09.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,6 +29,7 @@ - ROOT = ../../../../../../ - DIR = Providers/TestProviders/CMPI/TestIndications/tests - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -48,7 +49,9 @@ - - SOURCES = TestCMPIIndicationSubscription.cpp - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/Makefile.make_install 2005-07-22 16:49:40.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - DIR = Providers/TestProviders/CMPI/TestIndications - - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_ROOT=\"$(PEGASUS_ROOT)\" -@@ -47,6 +48,7 @@ - SOURCES = \ - cmpiTestIndicationProvider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/tests/Makefile.make_install 2005-07-01 17:54:25.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,6 +27,7 @@ - #// - #//============================================================================== - ROOT = ../../../../../../ -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -41,7 +42,9 @@ - - PROGRAM = TestCMPI_Fail_2 - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/Makefile.make_install 2005-06-24 15:57:39.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -46,6 +47,7 @@ - SOURCES = \ - cmpiTestFail_2Provider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/tests/Makefile.make_install 2005-07-01 17:54:26.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../../../ - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -47,7 +48,9 @@ - - PROGRAM = TestCMPIInstanceExecQuery - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - LOGFILES = TestCMPIInstance ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/Makefile.make_install 2005-07-22 16:54:22.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/CMPI/TestInstance - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_ROOT=\"$(PEGASUS_ROOT)\" -@@ -46,6 +47,7 @@ - SOURCES = \ - cmpiTestInstanceProvider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/tests/Makefile.make_install 2005-08-04 15:11:53.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,6 +27,7 @@ - #// - #//============================================================================== - ROOT = ../../../../../../ -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -41,7 +42,9 @@ - - PROGRAM = TestCMPIThreadProvider - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/test/config.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/Makefile.make_install 2005-08-04 15:11:53.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - DIR = Providers/TestProviders/CMPI/TestProviderThreaded - - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -45,6 +46,7 @@ - SOURCES = \ - cmpiTestCMPIThreadProvider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/tests/Makefile.make_install 2005-07-29 14:54:03.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,13 @@ - #//============================================================================== - - ROOT = ../../../../../../ -+TEST=true - include $(ROOT)/mak/config.mak -+ - include $(ROOT)/test/config.mak - - XMLSCRIPTS = EnumerateInstance_Fail_4 - - include $(ROOT)/test/configend.mak -+ -+install: ---- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/Makefile.make_install 2005-07-29 14:54:02.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL - -+TEST=true - include $(ROOT)/mak/config.mak - - ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM) -@@ -46,6 +47,7 @@ - SOURCES = \ - cmpiTestFail_4Provider.c - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/FamilyProvider/tests/Makefile.make_install 2005-05-12 11:41:12.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/FamilyProvider/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,9 @@ - # Test the Family Provider using the script toosls - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - SHH = @ - -@@ -199,4 +201,6 @@ - - clean: - -+install: -+ - # END_OF_FILE ---- pegasus-2.5/src/Providers/TestProviders/FamilyProvider/Makefile.make_install 2005-05-12 11:41:11.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/FamilyProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/FamilyProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = FamilyProvider -@@ -43,6 +44,7 @@ - FamilyProviderMain.cpp \ - FamilyProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/Makefile.make_install 2005-08-04 15:11:53.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,8 @@ - # This makefile simply recurses all of the toplevel provider directories - - ROOT = ../../.. -- -+TEST = true -+TEST=true - include $(ROOT)/mak/config.mak - - #Directories to recurse -@@ -78,4 +79,5 @@ - CMPI/TestInstance/tests - endif - endif -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Providers/TestProviders/AlertIndicationProvider/Makefile.make_install 2005-05-12 11:32:08.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/AlertIndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Providers/TestProviders/AlertIndicationProvider -@@ -42,4 +43,5 @@ - AlertIndicationProviderMain.cpp \ - AlertIndicationProvider.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/TestProviders/ProcessIndicationProvider/Makefile.make_install 2005-05-12 11:41:15.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/ProcessIndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,6 +26,7 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIR = Providers/TestProviders/ProcessIndicationProvider -@@ -41,4 +42,5 @@ - ProcessIndicationProviderMain.cpp \ - ProcessIndicationProvider.cpp - -+TEST=true - include $(PEGASUS_ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Providers/TestProviders/DynamicIndicationProvider/Makefile.make_install 2005-05-12 11:41:11.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/DynamicIndicationProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/DynamicIndicationProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY -@@ -44,4 +45,5 @@ - DynamicIndicationProviderMain.cpp \ - DynamicIndicationProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak ---- pegasus-2.5/src/Providers/TestProviders/ClientProvider/Makefile.make_install 2005-05-12 11:41:10.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/ClientProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/ClientProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = TestClientProvider -@@ -43,6 +44,7 @@ - ClientProviderMain.cpp \ - ClientProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/ClientProvider/Load/Makefile.make_install 2005-05-12 11:41:10.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/ClientProvider/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -34,7 +34,9 @@ - # remove function. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # The following variable determine the version of the Schema to ---- pegasus-2.5/src/Providers/TestProviders/DefaultInstanceProvider/Makefile.make_install 2005-05-12 11:41:11.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/DefaultInstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/DefaultInstanceProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = PG_DefaultInstanceProvider -@@ -45,6 +46,7 @@ - DefaultInstanceProvider.cpp \ - DefaultInstanceProviderMain.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/Makefile.make_install 2005-05-12 11:41:15.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/UserContextTestProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = UserContextTestProvider -@@ -41,6 +42,7 @@ - SOURCES = \ - UserContextTestProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/testclient/Makefile.make_install 2005-05-12 11:41:15.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -32,6 +32,7 @@ - - DIR = Providers/TestProviders/UserContextTestProvider/testclient - -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -46,6 +47,7 @@ - - SOURCES = TestUserContext.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/PG_TestPropertyTypes/Makefile.make_install 2005-05-12 11:41:14.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/PG_TestPropertyTypes/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/PG_TestPropertyTypes - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = PG_TestPropertyTypes -@@ -42,6 +43,7 @@ - SOURCES = \ - PG_TestPropertyTypes.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/Load/Makefile.make_install 2005-07-29 14:54:03.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -37,7 +37,9 @@ - # making this probably implementation independent. - - ROOT = $(PEGASUS_ROOT) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - # Loads the sample MOF into a separate namespace. ---- pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/Makefile.make_install 2005-05-12 11:41:12.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/IndicationStressTestProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = IndicationStressTestProvider -@@ -43,6 +44,7 @@ - IndicationStressTestProviderMain.cpp \ - IndicationStressTestProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile.make_install 2005-08-09 16:51:22.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/IndicationStressTestProvider/testclient - -+TEST=true - include $(ROOT)/mak/config.mak - - PEGASUS_ZOS_PROGRAM_OBJECT = yes -@@ -51,6 +52,7 @@ - - SOURCES = IndicationStressTest.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Providers/TestProviders/MCCA_TestAssocProvider/Makefile.make_install 2005-05-12 11:41:13.000000000 -0400 -+++ pegasus-2.5/src/Providers/TestProviders/MCCA_TestAssocProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Providers/TestProviders/MCCA_TestAssocProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = MCCATestAssocProvider -@@ -43,6 +44,7 @@ - MCCA_TestAssocProviderMain.cpp \ - MCCA_TestAssocProvider.cpp - -+TEST=true - include $(ROOT)/mak/dynamic-library.mak - - tests: ---- pegasus-2.5/src/Clients/cimprovider/tests/Makefile.make_install 2005-05-12 11:27:41.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimprovider/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - DIR = Clients/cimprovider/tests - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - RESULTFILE = $(TMP_DIR)/result -@@ -110,3 +112,5 @@ - strip-license: - - prepend-license: -+ -+install: ---- pegasus-2.5/src/Clients/tomof/Makefile.make_install 2005-05-12 11:27:46.000000000 -0400 -+++ pegasus-2.5/src/Clients/tomof/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,7 +27,7 @@ - #// - #//============================================================================== - ROOT = $(PEGASUS_ROOT) -- -+PEGASUS_INSTALL= - PROGRAM_NAME = tomof - DIR = Clients/$(PROGRAM_NAME) - include $(ROOT)/mak/config.mak ---- pegasus-2.5/src/Clients/g11ntest/Makefile.make_install 2005-05-12 11:27:42.000000000 -0400 -+++ pegasus-2.5/src/Clients/g11ntest/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT = $(PEGASUS_ROOT) - - PEGASUS_ZOS_PROGRAM_OBJECT = yes -- -+TEST=true - DIR = Clients/g11ntest - include $(ROOT)/mak/config.mak - ---- pegasus-2.5/src/Clients/cimuser/tests/Makefile.make_install 2005-05-12 11:27:41.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimuser/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - DIR = Clients/cimuser/tests - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - RESULTFILE = $(TMP_DIR)/result ---- pegasus-2.5/src/Clients/cimuser/Makefile.make_install 2005-05-12 11:27:41.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimuser/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -46,6 +46,8 @@ - - SOURCES = CIMUserCommand.cpp - -+INSTALL_BIN=sbin -+ - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/TestClient/Makefile.make_install 2005-05-12 11:27:37.000000000 -0400 -+++ pegasus-2.5/src/Clients/TestClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT = $(PEGASUS_ROOT) - - PEGASUS_ZOS_PROGRAM_OBJECT = yes -- -+TEST=true - DIR = Clients/TestClient - include $(ROOT)/mak/config.mak - ---- pegasus-2.5/src/Clients/repupgrade/tests/Makefile.make_install 2005-05-12 11:27:45.000000000 -0400 -+++ pegasus-2.5/src/Clients/repupgrade/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -37,6 +37,7 @@ - - DIR = Clients/repupgrade/tests - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -49,7 +50,9 @@ - - SOURCES = UpgradeTest.cpp - -+TEST=true - include $(ROOT)/mak/program.mak -+TEST=true - include $(ROOT)/mak/test.mak - - tests: ---- pegasus-2.5/src/Clients/repupgrade/Makefile.make_install 2005-05-12 11:27:44.000000000 -0400 -+++ pegasus-2.5/src/Clients/repupgrade/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT = ../../.. - - PEGASUS_ZOS_PROGRAM_OBJECT = yes -- -+PEGASUS_INSTALL = - DIR = Clients/repupgrade - - include $(ROOT)/mak/config.mak ---- pegasus-2.5/src/Clients/repupgrade/SSPModules/SampleSSPModule/Makefile.make_install 2005-05-12 11:27:45.000000000 -0400 -+++ pegasus-2.5/src/Clients/repupgrade/SSPModules/SampleSSPModule/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT = ../../../../../ - - DIR = Clients/repupgrade/SSPModules/SampleSSPModule -- -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_CONFIG_INTERNAL -DPEGASUS_INTERNALONLY -@@ -49,5 +49,5 @@ - - SOURCES = \ - SampleSSPModule.cpp -- -+TEST=true - include $(ROOT)/mak/dynamic-library.mak ---- pegasus-2.5/src/Clients/TestCertClient/Makefile.make_install 2005-05-12 11:27:37.000000000 -0400 -+++ pegasus-2.5/src/Clients/TestCertClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT = $(PEGASUS_ROOT) - - PEGASUS_ZOS_PROGRAM_OBJECT = yes -- -+TEST=true - DIR = Clients/TestCertClient - include $(ROOT)/mak/config.mak - ---- pegasus-2.5/src/Clients/CLITestClients/CreateInstance/Makefile.make_install 2005-05-12 11:27:33.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/CreateInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - PROGRAM_NAME = CreateInstance - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -41,6 +43,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CLITestClients/EnumerateInstances/Makefile.make_install 2005-05-12 11:27:34.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/EnumerateInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - PROGRAM_NAME = EnumerateInstances - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -41,6 +43,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CLITestClients/GetInstance/Makefile.make_install 2005-05-12 11:27:34.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/GetInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - PROGRAM_NAME = GetInstance - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -41,6 +43,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CLITestClients/Makefile.make_install 2005-05-12 11:27:34.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,7 +27,8 @@ - #// - #//============================================================================== - ROOT = $(PEGASUS_ROOT) -- -+TEST = true -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ -@@ -41,4 +42,5 @@ - - - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Clients/CLITestClients/EnumInstNames/Makefile.make_install 2005-05-12 11:27:33.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/EnumInstNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - PROGRAM_NAME = EnumInstNames - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -41,6 +43,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CLITestClients/CLI/Makefile.make_install 2005-05-12 11:27:32.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/CLI/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - PROGRAM_NAME = CLI - - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -46,6 +47,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CLITestClients/CLI/doc/Makefile.make_install 2005-06-03 12:19:58.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/CLI/doc/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -36,6 +36,7 @@ - # found in Linux/Unix environments including. - # nroff and man2html - # -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - GROFFOPTIONS=man ---- pegasus-2.5/src/Clients/CLITestClients/EnumerateInstanceNames/Makefile.make_install 2005-05-12 11:27:34.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/EnumerateInstanceNames/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - PROGRAM_NAME = EnumerateInstanceNames - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -41,6 +43,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CLITestClients/DeleteInstance/Makefile.make_install 2005-05-12 11:27:33.000000000 -0400 -+++ pegasus-2.5/src/Clients/CLITestClients/DeleteInstance/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - PROGRAM_NAME = DeleteInstance - DIR = Clients/CLITestClients/$(PROGRAM_NAME) -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../../libraries.mak - - EXTRA_INCLUDES = $(SYS_INCLUDES) -@@ -41,6 +43,7 @@ - - SOURCES = $(PROGRAM_NAME).cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/ssltrustmgr/tests/Makefile.make_install 2005-09-01 08:35:01.000000000 -0400 -+++ pegasus-2.5/src/Clients/ssltrustmgr/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,8 +30,11 @@ - - DIR = Clients/ssltrustmgr/tests - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak -+TEST=true - include $(ROOT)/mak/commands.mak - - RESULTFILE = $(TMP_DIR)/result -@@ -263,3 +266,5 @@ - strip-license: - - prepend-license: -+ -+install: ---- pegasus-2.5/src/Clients/ssltrustmgr/Makefile.make_install 2005-05-12 11:27:45.000000000 -0400 -+++ pegasus-2.5/src/Clients/ssltrustmgr/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -48,7 +48,7 @@ - pegcommon - - EXTRA_INCLUDES = $(SYS_INCLUDES) -- -+INSTALL_BIN=sbin - PROGRAM = ssltrustmgr - - SOURCES = \ ---- pegasus-2.5/src/Clients/cimauth/tests/Makefile.make_install 2005-05-12 11:27:39.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimauth/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - DIR = Clients/cimauth/tests - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - RESULTFILE = $(TMP_DIR)/result ---- pegasus-2.5/src/Clients/cimauth/Makefile.make_install 2005-05-12 11:27:39.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimauth/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,8 @@ - - SOURCES = CIMAuthCommand.cpp - -+INSTALL_BIN=sbin -+ - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/ipinfo/Makefile.make_install 2005-05-12 11:27:43.000000000 -0400 -+++ pegasus-2.5/src/Clients/ipinfo/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,8 @@ - - PEGASUS_ZOS_PROGRAM_OBJECT = yes - -+PEGASUS_INSTALL= -+ - DIR = Clients/ipinfo - include $(ROOT)/mak/config.mak - ---- pegasus-2.5/src/Clients/SendTestIndications/Makefile.make_install 2005-05-12 11:27:36.000000000 -0400 -+++ pegasus-2.5/src/Clients/SendTestIndications/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,6 +27,9 @@ - #// - #//============================================================================== - ROOT = ../../.. -+TEST = true -+ -+TEST=true - include $(ROOT)/mak/config.mak - - DIR = Clients/SendTestIndications -@@ -38,6 +41,7 @@ - pegclient \ - pegcommon - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/CGIClient/tests/Makefile.make_install 2005-05-12 11:27:31.000000000 -0400 -+++ pegasus-2.5/src/Clients/CGIClient/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,9 +28,11 @@ - #//============================================================================== - ROOT = ../../../.. - -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ - CGIQueryString - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/src/Clients/CGIClient/tests/CGIQueryString/Makefile.make_install 2005-05-12 11:27:31.000000000 -0400 -+++ pegasus-2.5/src/Clients/CGIClient/tests/CGIQueryString/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -28,6 +28,7 @@ - #//============================================================================== - ROOT = ../../../../.. - DIR = Clients/CGIClient/tests/CGIQueryString -+TEST=true - include $(ROOT)/mak/config.mak - - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -@@ -45,6 +46,7 @@ - ../../CGIQueryString.cpp \ - CGIQueryString.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - ifeq ($(OS),VMS) ---- pegasus-2.5/src/Clients/CGIClient/Makefile.make_install 2005-05-12 11:27:31.000000000 -0400 -+++ pegasus-2.5/src/Clients/CGIClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -33,7 +33,7 @@ - DIR = Clients/CGIClient - include $(ROOT)/mak/config.mak - include ../libraries.mak -- -+PEGASUS_INSTALL= - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY - - PROGRAM = CGIClient ---- pegasus-2.5/src/Clients/cimconfig/tests/Makefile.make_install 2005-05-12 11:27:40.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimconfig/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,7 +30,9 @@ - - DIR = Clients/cimconfig/tests - -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/test.mak - - RESULTFILE = $(TMP_DIR)/result ---- pegasus-2.5/src/Clients/cimconfig/Makefile.make_install 2005-05-12 11:27:39.000000000 -0400 -+++ pegasus-2.5/src/Clients/cimconfig/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -47,6 +47,8 @@ - - SOURCES = CIMConfigCommand.cpp - -+INSTALL_BIN=sbin -+ - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/benchmarkTest/benchmarkProvider/Makefile.make_install 2005-05-12 11:27:38.000000000 -0400 -+++ pegasus-2.5/src/Clients/benchmarkTest/benchmarkProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Clients/benchmarkTest/benchmarkProvider - -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARY = benchmarkProviderModule -@@ -43,4 +44,5 @@ - benchmarkProvider.cpp \ - benchmarkProviderMain.cpp - -+TEST=true - include $(ROOT)/mak/library.mak ---- pegasus-2.5/src/Clients/benchmarkTest/benchmarkClient/Makefile.make_install 2005-05-12 11:27:38.000000000 -0400 -+++ pegasus-2.5/src/Clients/benchmarkTest/benchmarkClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -31,6 +31,7 @@ - PEGASUS_ZOS_PROGRAM_OBJECT = yes - - DIR = Clients/benchmarkTest/benchmarkClient -+TEST=true - include $(ROOT)/mak/config.mak - - LIBRARIES = \ -@@ -43,6 +44,7 @@ - PROGRAM = benchmarkTest - SOURCES = benchmarkTest.cpp benchmarkTestException.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/src/Clients/benchmarkTest/Load/Makefile.make_install 2005-05-12 11:27:37.000000000 -0400 -+++ pegasus-2.5/src/Clients/benchmarkTest/Load/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -26,9 +26,13 @@ - #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #// - #//============================================================================== -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak -+TEST=true - include $(PEGASUS_ROOT)/mak/configschema.mak -+TEST=true - include $(PEGASUS_ROOT)/mak/test.mak -+TEST=true - include $(PEGASUS_ROOT)/mak/commands.mak - - ifdef TESTID ---- pegasus-2.5/src/Clients/benchmarkTest/benchmarkDefinition/Makefile.make_install 2005-05-12 11:27:38.000000000 -0400 -+++ pegasus-2.5/src/Clients/benchmarkTest/benchmarkDefinition/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -29,7 +29,7 @@ - ROOT = $(PEGASUS_ROOT) - - DIR = Clients/benchmarkTest/benchmarkDefinition -- -+TEST=true - include $(ROOT)/mak/config.mak - - -@@ -43,6 +43,7 @@ - SOURCES = \ - benchmarkDefinition.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - tests: ---- pegasus-2.5/src/Clients/wbemexec/tests/Makefile.make_install 2005-05-18 21:58:50.000000000 -0400 -+++ pegasus-2.5/src/Clients/wbemexec/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -30,6 +30,7 @@ - - DIR = Clients/wbemexec/tests - -+TEST=true - include $(ROOT)/mak/config.mak - include $(ROOT)/mak/test.mak - -@@ -702,3 +703,4 @@ - - prepend-license: - -+install: -\ No newline at end of file ---- pegasus-2.5/src/Clients/MCCATestClient/Makefile.make_install 2005-05-12 11:27:35.000000000 -0400 -+++ pegasus-2.5/src/Clients/MCCATestClient/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -27,13 +27,16 @@ - #// - #//============================================================================== - ROOT = $(PEGASUS_ROOT) -- -+TEST = true -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include $(ROOT)/mak/configschema.mak - - PEGASUS_ZOS_PROGRAM_OBJECT = yes - - DIR = Clients/MCCATestClient -+TEST=true - include $(ROOT)/mak/config.mak - - ifdef PEGASUS_HAS_SSL -@@ -57,6 +60,7 @@ - endif - endif - -+TEST=true - include $(ROOT)/mak/program.mak - - tests: ---- pegasus-2.5/InterfaceArchive/v002001/tests/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -1,9 +1,11 @@ - ROOT = $(PEGASUS_ROOT) - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - Providers \ - Clients - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -2,7 +2,9 @@ - - DIR = InterfaceArchive/$(VERSION)/tests/Providers/InstanceProvider - -+TEST=true - include ../../../version.mak -+TEST=true - include $(ROOT)/mak/config.mak - LIBRARY = SampleInstanceProvider - -@@ -14,6 +16,7 @@ - InstanceProviderMain.cpp \ - InstanceProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY ---- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile.make_install 2003-10-07 03:46:28.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -1,7 +1,9 @@ -+TEST=true - include $(PEGASUS_ROOT)/mak/config.mak - - DIRS = \ - InstanceProvider \ - MethodProvider - -+TEST=true - include $(PEGASUS_ROOT)/mak/recurse.mak ---- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -2,7 +2,9 @@ - - DIR = InterfaceArchive/$(VERSION)/tests/Providers/MethodProvider - -+TEST=true - include ../../../version.mak -+TEST=true - include $(ROOT)/mak/config.mak - LIBRARY = SampleMethodProvider - -@@ -14,6 +16,7 @@ - MethodProviderMain.cpp \ - MethodProvider.cpp - -+TEST=true - include $(ROOT)/mak/library.mak - - ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY ---- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -1,9 +1,11 @@ - ROOT = $(PEGASUS_ROOT) - -+TEST=true - include $(ROOT)/mak/config.mak - - DIRS = \ - EnumInstances \ - InvokeMethod - -+TEST=true - include $(ROOT)/mak/recurse.mak ---- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -4,8 +4,11 @@ - - DIR = InterfaceArchive/$(VERSION)/tests/Clients/EnumInstances - -+TEST=true - include ../../../version.mak -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = -@@ -13,6 +16,7 @@ - PROGRAM = EnumInstances - SOURCES = EnumInstances.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY ---- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile.make_install 2003-10-07 02:42:45.000000000 -0400 -+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -4,8 +4,11 @@ - - DIR = InterfaceArchive/$(VERSION)/tests/Clients/InvokeMethod - -+TEST=true - include ../../../version.mak -+TEST=true - include $(ROOT)/mak/config.mak -+TEST=true - include ../libraries.mak - - EXTRA_INCLUDES = -@@ -13,6 +16,7 @@ - PROGRAM = InvokeMethod - SOURCES = InvokeMethod.cpp - -+TEST=true - include $(ROOT)/mak/program.mak - - ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY ---- pegasus-2.5/Schemas/Pegasus/Makefile.make_install 2005-05-12 11:27:26.000000000 -0400 -+++ pegasus-2.5/Schemas/Pegasus/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -68,3 +68,19 @@ - - xml: - $(MAKE) -f $(ROOT)/Schemas/Makefile xml -+ -+install_repository: $(PEGASUS_HOME)/repository -+ifdef PEGASUS_INSTALL -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR) -+ cp -rfp $(PEGASUS_HOME)/repository/* $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR) -+endif -+ -+install: -+ifdef PEGASUS_INSTALL -+ ifdef PEGASUS_MOF_DIR -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus -+ /bin/cp -fp Internal/VER20/* InterOp/VER20/* ManagedSystem/VER20/* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus -+ chmod 444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus/* -+ chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus >/dev/null 2>&1 || :; -+ endif -+endif ---- pegasus-2.5/Schemas/Makefile.make_install 2005-05-12 11:27:25.000000000 -0400 -+++ pegasus-2.5/Schemas/Makefile 2005-10-03 12:32:47.000000000 -0400 -@@ -92,3 +92,16 @@ - @ $(ECHO) +++++ Creating XML for CIM Schema$(CIM_SCHEMA_VER).mof in file $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml - $(CIMMOFCLI) "-R$(TMP_DIR)" --xml "-I$(CIM_SCHEMA_DIR)" -nxml/cimv2 $(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof > $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml - @ $(RMREPOSITORY) $(TMP_DIR)/repository -+ -+install: -+ifdef PEGASUS_INSTALL -+ ifdef PEGASUS_MOF_DIR -+ mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR) -+ cp -rfp CIM* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/ -+ chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/* >/dev/null 2>&1 || :; -+ chmod 0444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM*/* >/dev/null 2>&1 || :; -+ chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM* || :; -+ make -SC Pegasus install -+ endif -+endif -+ diff --git a/pegasus-2.5-redhat.patch b/pegasus-2.5-redhat.patch deleted file mode 100644 index 3fe3c2c..0000000 --- a/pegasus-2.5-redhat.patch +++ /dev/null @@ -1,778 +0,0 @@ ---- pegasus-2.5/Makefile.ReleaseTest.redhat 2005-05-27 13:29:01.000000000 -0400 -+++ pegasus-2.5/Makefile.ReleaseTest 2005-10-03 17:12:17.000000000 -0400 -@@ -54,7 +54,7 @@ - endif - - TEST_BIN_FILES_SRCPATH = $(PEGASUS_HOME)/bin --TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/lib -+TEST_LIB_FILES_SRCPATH = $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) - TEST_MAK_FILES_SRCPATH = $(ROOT)/mak - - MAK_FILES = \ -@@ -121,7 +121,7 @@ - stageTEST: - @$(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR) - @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin -- @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib -+ @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR) - @$(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak - @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_makfiles - @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s stage_testproviderfiles -@@ -134,7 +134,7 @@ - @$(foreach i, $(MAK_FILES), $(COPY) $(TEST_MAK_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/mak/$(i);) - - stage_testproviderfiles: -- @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);) -+ @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(COPY) $(TEST_LIB_FILES_SRCPATH)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX);) - - stage_prestarttests: - @$(foreach i, $(PRESTARTTEST_FILES), $(COPY) $(TEST_BIN_FILES_SRCPATH)/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/bin/$(i);) -@@ -157,7 +157,7 @@ - - createMakefile_providerlinks: - @$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile -- @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;) -+ @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\t@$(MAKE) createlink OBJECT=$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;) - @$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile - @$(ECHO-E) "remove_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile - @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;) -@@ -234,7 +234,7 @@ - @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest -s preinstall_setreleasepermissions - - preinstall_setreleasepermissions: -- @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX);) -+ @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.ReleaseTest setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX);) - - _append_preunSectionToSpecFile: - @$(ECHO-E) "%if %{PEGASUS_BUILD_TEST_RPM}" >> $(PEGASUS_RPM_SPEC_FILE_PATH) -@@ -253,13 +253,13 @@ - @$(ECHO-E) "# Test Files" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH) -- @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib" >> $(PEGASUS_RPM_SPEC_FILE_PATH) -+ @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "%dir %attr($(Pr_xr_xr_x), $(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(foreach i, $(MAK_FILES), $(ECHO-E) \ - "%attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/mak/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) - @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) \ -- "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/lib/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) -+ "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) - @$(foreach i, $(PRESTARTTEST_FILES), $(ECHO-E) \ - "%attr($(Pr_xr_xr_x),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_TEST_DIR)/bin/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);) - @$(foreach i, $(POSTSTARTTEST_FILES), $(ECHO-E) \ ---- pegasus-2.5/Makefile.Release.redhat 2005-08-17 17:00:43.000000000 -0400 -+++ pegasus-2.5/Makefile.Release 2005-10-03 17:12:17.000000000 -0400 -@@ -481,13 +481,13 @@ - $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR) - - stage_PegasusLibraryDirectoryFiles: FORCE -- $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);) -+ $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);) - $(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) -f $(ROOT)/Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);) - - setpermissions_PegasusLibraryDirectoryFiles: FORCE - $(foreach i, $(PEGASUS_LIBRARIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);) - stage_PegasusProviderLibraryDirectoryFiles: FORCE -- $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);) -+ $(foreach i, $(PEGASUS_PROVIDERS), $(COPY) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_SUFFIX);) - $(foreach i, $(PEGASUS_PROVIDERS), $(MAKE) -f $(ROOT)/Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);) - - setpermissions_PegasusProviderLibraryDirectoryFiles: FORCE ---- pegasus-2.5/env_var_Linux.status.redhat 2005-09-02 14:40:58.000000000 -0400 -+++ pegasus-2.5/env_var_Linux.status 2005-10-03 17:12:17.000000000 -0400 -@@ -9,6 +9,7 @@ - PEGASUS_OVERRIDE_PRODUCT_ID=yes - PEGASUS_PRODUCT_NAME="OpenPegasus" - PEGASUS_PRODUCT_VERSION="2.5.0" -+PEGASUS_RPM_VERSION="2.5" - PEGASUS_PRODUCT_STATUS="" - - PAM_CONFIG_DIR=/etc/pam.d -@@ -25,32 +26,31 @@ - PEGASUS_HAS_SSL=yes - PEGASUS_NOASSERTS=yes - PEGASUS_PAM_AUTHENTICATION=true --PEGASUS_USE_PAM_STANDALONE_PROC=true - PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true - PEGASUS_USE_RELEASE_DIRS=true - PEGASUS_USE_SYSLOGS=true - PEGASUS_CIM_SCHEMA=CIM29 - --PEGASUS_PROD_DIR = /opt/tog-pegasus --PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share --PEGASUS_DOC_DIR = $(PEGASUS_PRODSHARE_DIR)/doc --PEGASUS_MAN_DIR = $(PEGASUS_PRODSHARE_DIR)/man -+PEGASUS_PROD_DIR = /usr -+PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share/Pegasus -+PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-$(PEGASUS_RPM_VERSION) -+PEGASUS_MAN_DIR = /usr/share/man - PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1 - PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8 --PEGASUS_MOF_DIR = $(PEGASUS_PROD_DIR)/mof --PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/lib --PEGASUS_PROVIDER_DIR = $(PEGASUS_PROD_DIR)/providers --PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/lib -+PEGASUS_MOF_DIR = $(PEGASUS_PRODSHARE_DIR)/mof -+PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/$(PEGASUS_ARCH_LIB_DIR) -+PEGASUS_PROVIDER_DIR = $(PEGASUS_DEST_LIB_DIR)/Pegasus/providers -+PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_DIR) - PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin - PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin --PEGASUS_VARDATA_DIR = /var/opt/tog-pegasus -+PEGASUS_VARDATA_DIR = /var/lib/Pegasus - PEGASUS_REPOSITORY_PARENT_DIR = $(PEGASUS_VARDATA_DIR) - PEGASUS_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/repository - PEGASUS_PREV_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/prev_repository --PEGASUS_CONFIG_DIR = /etc/opt/tog-pegasus -+PEGASUS_CONFIG_DIR = /etc/Pegasus - PEGASUS_VARRUN_DIR = /var/run/tog-pegasus - PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid --PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket -+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR) - PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket - PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VARDATA_DIR)/cache - PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth -@@ -63,11 +63,11 @@ - PEGASUS_SSL_CERT_FILE = server.pem - PEGASUS_SSL_TRUSTSTORE = client.pem - --PEGASUS_SAMPLES_DIR = $(PEGASUS_PROD_DIR)/samples -+PEGASUS_SAMPLES_DIR = $(PEGASUS_PRODSHARE_DIR)/samples - PEGASUS_INCLUDE_DIR = $(PEGASUS_PROD_DIR)/include --PEGASUS_HTML_DIR = $(PEGASUS_PROD_DIR)/html -+PEGASUS_HTML_DIR = $(PEGASUS_PRODSHARE_DIR)/html - --PEGASUS_TEST_DIR = $(PEGASUS_PROD_DIR)/test -+PEGASUS_TEST_DIR = $(PEGASUS_PRODSHARE_DIR)/test - PEGASUS_TEST_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR) - PEGASUS_TEST_REPOSITORY_NAME = testrepository - ---- pegasus-2.5/mak/objects-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400 -+++ pegasus-2.5/mak/objects-unix.mak 2005-10-03 17:12:17.000000000 -0400 -@@ -50,12 +50,12 @@ - - ifeq ($(_NO_TMP_O), yes) - $(OBJ_DIR)/%.o: %.cpp $(ERROR) -- $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp -+ $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.cpp - @ $(TOUCH) $@ - @ $(ECHO) - else - $(OBJ_DIR)/%.o: %.cpp $(ERROR) -- $(CXX) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp -+ $(CXX) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.cpp - @ $(COPY) $(_TMP_O) $@ - @ $(RM) $(_TMP_O) - @ $(TOUCH) $@ -@@ -64,12 +64,12 @@ - - ifeq ($(_NO_TMP_O), yes) - $(OBJ_DIR)/%.o: %.c $(ERROR) -- $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c -+ $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.c - @ $(TOUCH) $@ - @ $(ECHO) - else - $(OBJ_DIR)/%.o: %.c $(ERROR) -- $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c -+ $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(INCLUDES) $(SYS_INCLUDES) $*.c - @ $(COPY) $(_TMP_O) $@ - @ $(RM) $(_TMP_O) - @ $(TOUCH) $@ ---- pegasus-2.5/mak/config-linux.mak.redhat 2005-05-12 11:27:28.000000000 -0400 -+++ pegasus-2.5/mak/config-linux.mak 2005-10-03 17:12:17.000000000 -0400 -@@ -76,10 +76,12 @@ - - SYS_LIBS = -ldl -lpthread - -+PEGASUS_INSTALL = /usr/bin/install -+ - # Build using fixed release settings - # - ifdef PEGASUS_USE_RELEASE_DIRS -- PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib -+ PEGASUS_DEST_LIB_DIR=/usr/$(PEGASUS_ARCH_LIB_DIR) - endif - - # PAM support -@@ -102,7 +104,7 @@ - ifdef PEGASUS_DEBUG - FLAGS += -g -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT - else --FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s -fno-enforce-eh-specs -+FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -fno-enforce-eh-specs - ifdef PEGASUS_OPTIMIZE_FOR_SIZE - FLAGS += -Os - else -@@ -152,7 +154,7 @@ - - SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n - DEFINES += -DPEGASUS_HAS_ICU -- EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata -+ EXTRA_LIBRARIES += -L$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -licuuc -licui18n -licudata - endif - endif - ---- pegasus-2.5/mak/SDKMakefile.redhat 2005-07-15 15:46:17.000000000 -0400 -+++ pegasus-2.5/mak/SDKMakefile 2005-10-03 17:12:17.000000000 -0400 -@@ -382,10 +382,10 @@ - @$(MAKE) --directory=$(PEGASUS_ROOT)/mak -f SDKMakefile -i deregisterproviders - @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile clean \ - PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \ -- PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib -+ PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) - @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile all \ -- PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \ -- PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/lib PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \ -+ PEGASUS_PROVIDER_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) PEGASUS_INCLUDE_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_INCLUDE_DIR) \ -+ PEGASUS_DEST_LIB_DIR=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) \ - PEGASUS_INDICATION_CONSUMER_LOG_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/DefaultC++/SimpleDisplayConsumer - @$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/Providers/Load -f Makefile createrepository \ - PEGASUS_MOF_DIR=$(PEGASUS_ROOT)/Schemas PEGASUS_BIN_DIR=$(PEGASUS_HOME)bin ---- pegasus-2.5/mak/config.mak.redhat 2005-08-12 13:52:31.000000000 -0400 -+++ pegasus-2.5/mak/config.mak 2005-10-03 17:12:17.000000000 -0400 -@@ -85,7 +85,7 @@ - - OBJ_DIR = $(HOME_DIR)/obj/$(DIR) - BIN_DIR = $(HOME_DIR)/bin --LIB_DIR = $(HOME_DIR)/lib -+LIB_DIR = $(HOME_DIR)/$(PEGASUS_ARCH_LIB_DIR) - - # l10n - # define the location for the compiled messages -@@ -544,7 +544,7 @@ - - # Unless otherwise specified, Pegasus libraries go in $(PEGASUS_HOME)/lib - ifndef PEGASUS_DEST_LIB_DIR -- PEGASUS_DEST_LIB_DIR = lib -+ PEGASUS_DEST_LIB_DIR = $(PEGASUS_ARCH_LIB_DIR) - endif - - ifeq ($(OS),VMS) ---- pegasus-2.5/mak/program-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400 -+++ pegasus-2.5/mak/program-unix.mak 2005-10-03 17:14:17.000000000 -0400 -@@ -28,6 +28,12 @@ - #//============================================================================== - INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) - -+ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU -+ ifdef PEGASUS_EXE_LINK_FLAGS -+ EXTRA_LINK_FLAGS += $(PEGASUS_EXE_LINK_FLAGS) -+ endif -+endif -+ - TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) - - ifeq ($(OS_TYPE),windows) -@@ -56,7 +62,7 @@ - ifdef PEGASUS_HAS_MESSAGES - ifdef ICU_ROOT - ifdef ICU_INSTALL -- SYS_LIBS += -L${ICU_INSTALL}/lib -licui18n -licuuc -+ SYS_LIBS += -L${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -licui18n -licuuc - endif - endif - endif -@@ -90,17 +96,17 @@ - ifdef ICU_ROOT - ifdef ICU_INSTALL - ifdef PEGASUS_USE_RELEASE_DIRS -- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - else -- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/lib -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -Xlinker -rpath -Xlinker ${ICU_INSTALL}/$(PEGASUS_ARCH_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - endif - endif - endif - else - ifdef PEGASUS_USE_RELEASE_DIRS -- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -Xlinker -rpath-link -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - else -- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -Xlinker -rpath -Xlinker $(LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - endif - endif - else -@@ -109,11 +115,11 @@ - ifdef PEGASUS_HAS_MESSAGES - ifdef ICU_ROOT - ifdef ICU_INSTALL -- $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - endif - endif - else -- $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) -Wl,-brtl -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - endif - else - $(LINK_WRAPPER) $(CXX) -Wl,-brtl -Wl,-bhalt:$(AIX_LD_HALT) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -@@ -147,3 +153,5 @@ - -include $(OBJ_DIR)/depend.mak - - include $(ROOT)/mak/misc.mak -+ -+include $(ROOT)/mak/install-program-unix.mak ---- pegasus-2.5/mak/library-unix.mak.redhat 2005-05-12 11:27:28.000000000 -0400 -+++ pegasus-2.5/mak/library-unix.mak 2005-10-03 17:14:54.000000000 -0400 -@@ -32,11 +32,11 @@ - ifdef PEGASUS_HAS_MESSAGES - ifdef ICU_ROOT - ifdef ICU_INSTALL -- LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib:$(ICU_INSTALL)/lib -Wl,-bhalt:$(AIX_LD_HALT) -+ LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR):$(ICU_INSTALL)/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) - endif - endif - else -- LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/lib:/usr/lib:/lib -Wl,-bhalt:$(AIX_LD_HALT) -+ LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -blibpath:/usr/linux/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR):/$(PEGASUS_ARCH_LIB_DIR) -Wl,-bhalt:$(AIX_LD_HALT) - endif - else - LINK_ARGUMENTS = -qmkshrobj=$(AIX_LIB_PRIORITY) -Wl,-bhalt:$(AIX_LD_HALT) -@@ -56,12 +56,12 @@ - endif - ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes) - ifdef PEGASUS_USE_RELEASE_DIRS -- LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib -+ LINK_COMMAND += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) - ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC) -- LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR) -+ LINK_COMMAND += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/$(PEGASUS_ARCH_LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) -Wl,+cdp,$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR):$(PEGASUS_DEST_LIB_DIR) - endif - else -- LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/lib -+ LINK_COMMAND += -Wl,+b$(LIB_DIR):/usr/$(PEGASUS_ARCH_LIB_DIR) - endif - endif - LINK_COMMAND += -Wl,+s -@@ -79,10 +79,10 @@ - ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU) - ifdef PEGASUS_USE_RELEASE_DIRS - LINK_COMMAND = $(CXX) -shared -- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXTRA_LINK_ARGUMENTS) - else - LINK_COMMAND = $(CXX) -shared -- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS) -+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -L$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) -Xlinker -rpath-link -Xlinker $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) $(EXTRA_LINK_ARGUMENTS) - endif - else - LINK_COMMAND = $(CXX) -dynamiclib -@@ -164,3 +164,5 @@ - ln -f -s $(LIBRARY)$(SUFFIX) $(LIBRARY).$(PLATFORM_SUFFIX) - - FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB) -+ -+include $(ROOT)/mak/install-library-unix.mak ---- pegasus-2.5/rpm/wbem.redhat 2003-03-13 12:25:15.000000000 -0500 -+++ pegasus-2.5/rpm/wbem 2005-10-03 17:12:17.000000000 -0400 -@@ -1,13 +1,7 @@ - #%PAM-1.0 --auth required /lib/security/pam_env.so --auth sufficient /lib/security/pam_unix.so likeauth nullok --auth required /lib/security/pam_deny.so -- --account required /lib/security/pam_unix.so -- --password required /lib/security/pam_cracklib.so retry=3 type= --password sufficient /lib/security/pam_unix.so nullok use_authtok md5 shadow --password required /lib/security/pam_deny.so -- --session required /lib/security/pam_limits.so --session required /lib/security/pam_unix.so -+auth include system-auth -+account required pam_access.so accessfile=/etc/Pegasus/access.conf -+account include system-auth -+password include system-auth -+session include system-auth -+session required pam_loginuid.so ---- pegasus-2.5/rpm/tog-pegasus.rc.redhat 2005-05-29 02:43:30.000000000 -0400 -+++ pegasus-2.5/rpm/tog-pegasus.rc 2005-10-03 17:12:17.000000000 -0400 -@@ -1,34 +1,28 @@ - #! /bin/sh --#//%2005//////////////////////////////////////////////////////////////////////// --#// --#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development --#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. --#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; --#// IBM Corp.; EMC Corporation, The Open Group. --#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; --#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. --#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; --#// 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"), to --#// deal in the Software without restriction, including without limitation the --#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or --#// sell copies of the Software, and to permit persons to whom the Software is --#// furnished to do so, subject to the following conditions: --#// --#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN --#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED --#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT --#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR --#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT --#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN --#// 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. --#// --#//============================================================================== --#// --#//%///////////////////////////////////////////////////////////////////////////// -+#%///////////////////////////////////////////////////////////////////////////// -+# -+# Copyright (c) 2004 BMC Software, Hewlett-Packard Company, IBM, -+# The Open Group, Tivoli Systems -+# -+# Permission is hereby granted, free of charge, to any person obtaining a copy -+# of this software and associated documentation files (the "Software"), to -+# deal in the Software without restriction, including without limitation the -+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+# sell copies of the Software, and to permit persons to whom the Software is -+# furnished to do so, subject to the following conditions: -+# -+# THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN -+# ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED -+# "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -+# LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+# 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. -+# -+#============================================================================== -+# -+#%///////////////////////////////////////////////////////////////////////////// - - ### BEGIN INIT INFO - # Provides: tog-pegasus -@@ -40,7 +34,10 @@ - # Description: init script for Pegasus CIM server - ### END INIT INFO - --CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver -+CIMSERVER_BIN=/usr/sbin/cimserver -+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=server.pem} -+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=file.pem} -+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=client.pem} - prog=cimserver - - test -x $CIMSERVER_BIN || exit 5 -@@ -50,19 +47,22 @@ - - case "$1" in - start) -+ [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket - echo -n $"Starting up CIM server: " -+ if [ ! -e /etc/Pegasus/ssl.cnf ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_CERT_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_KEY_FILE ] || [ ! -e /etc/Pegasus/$PEGASUS_SSL_TRUSTSTORE ]; then -+ echo "Generating SSL certificates..."; -+ /usr/share/Pegasus/scripts/genSSLcerts; -+ fi; - $CIMSERVER_BIN - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start" -- echo - ;; -- - stop) - echo -n $"Shutting down CIM server: " - killproc cimserver - RETVAL=$? - [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop" -- echo -+ [ "$RETVAL" -eq 0 ] && [ -e /var/run/tog-pegasus/cimxml.socket ] && rm -f /var/run/tog-pegasus/cimxml.socket - ;; - status) - pid=`pidofproc $CIMSERVER_BIN` ---- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp.redhat 2005-04-18 17:18:24.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/ProviderManagerModule.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -134,7 +134,7 @@ - - int main(int argc, char** argv) - { -- const char * verbose = getenv("PEGASUS_TEST_VERBOSE"); -+ const char * verbose = getenv("PEGASUS_TEST_VERBOSE"), *p; - - const String FILE_NAME = - FileSystem::buildLibraryFileName("TestProviderManager"); -@@ -146,7 +146,11 @@ - #elif defined (PEGASUS_OS_VMS) - fileName= FILE_NAME; - #else -- fileName=String(getenv("PEGASUS_HOME"))+String("/lib/")+FILE_NAME; -+ fileName= String(getenv("PEGASUS_HOME")) -+ + String("/") -+ + String(((p = getenv("PEGASUS_ARCH_LIB_DIR")) == 0L) ? "lib" : p) -+ + String("/") -+ + FILE_NAME; - #endif - - Test1(); ---- pegasus-2.5/src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile.redhat 2005-05-12 11:30:52.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ProviderManager2/CMPI/samples/ProcessIndication/Makefile 2005-10-03 17:12:17.000000000 -0400 -@@ -29,7 +29,7 @@ - # Makefile for CMPIRT_SampleClass library - - # Change the following lines to match the values on your system --PEGDIRLIB=$(PEGASUS_HOME)/lib -+PEGDIRLIB=$(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR) - - # Changes shouldn't be necessary below this line - CFLAGS=-Wall -D_COMPILE_UNIX -g -I. -I../.. ---- pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h.redhat 2005-07-15 19:02:21.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Config/FixedPropertyTableLinux.h 2005-10-03 17:12:17.000000000 -0400 -@@ -45,19 +45,19 @@ - {"enableBinaryRepository", "false"}, - #endif - #if defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB) -- {"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"}, -+ {"traceFilePath", "/var/lib/Pegasus/cache/cimserver.trc"}, - #if !defined(PEGASUS_USE_SYSLOGS) -- {"logdir", "/var/opt/tog-pegasus/log"}, -+ {"logdir", "/var/log/Pegasus"}, - #endif -- {"passwordFilePath", "/etc/opt/tog-pegasus/cimserver.passwd"}, -- {"sslCertificateFilePath", "/etc/opt/tog-pegasus/server.pem"}, -- {"sslKeyFilePath", "/etc/opt/tog-pegasus/file.pem"}, -- {"sslTrustStore", "/etc/opt/tog-pegasus/cimserver_trust"}, -- {"exportSSLTrustStore", "/etc/opt/tog-pegasus/indication_trust"}, -- {"crlStore", "/etc/opt/tog-pegasus/crl"}, -- {"repositoryDir", "/var/opt/tog-pegasus/repository"}, -- {"providerDir", "/opt/tog-pegasus/providers/lib:/usr/lib/cmpi"}, -- {"messageDir", "/opt/tog-pegasus/share/locale/ICU_Messages"}, -+ {"passwordFilePath", "/etc/Pegasus/cimserver.passwd"}, -+ {"sslCertificateFilePath", "/etc/Pegasus/server.pem"}, -+ {"sslKeyFilePath", "/etc/Pegasus/file.pem"}, -+ {"sslTrustStore", "/etc/Pegasus/cimserver_trust"}, -+ {"exportSSLTrustStore", "/etc/Pegasus/indication_trust"}, -+ {"crlStore", "/etc/Pegasus/crl"}, -+ {"repositoryDir", "/var/lib/Pegasus/repository"}, -+ {"providerDir", PEGASUS_DEST_LIB_DIR "/Pegasus/providers"}, -+ {"messageDir", "/usr/share/locale"}, - #endif - #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB) - {"traceFilePath", "/var/opt/lsb-pegasus/cache/cimserver.trc"}, ---- pegasus-2.5/src/Pegasus/Config/ConfigFileDirLinux.h.redhat 2005-02-05 18:00:07.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Config/ConfigFileDirLinux.h 2005-10-03 17:12:17.000000000 -0400 -@@ -37,12 +37,12 @@ - /** - Default file name for the current configuration. - */ --static char CURRENT_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_current.conf"; -+static char CURRENT_CONFIG_FILE [] = "/etc/Pegasus/cimserver_current.conf"; - - /** - Default file name for the planned configuration. - */ --static char PLANNED_CONFIG_FILE [] = "/var/opt/tog-pegasus/cimserver_planned.conf"; -+static char PLANNED_CONFIG_FILE [] = "/etc/Pegasus/cimserver_planned.conf"; - - /** - Default file name for the cimserver startup file containing the PID. ---- pegasus-2.5/src/Pegasus/ControlProviders/CertificateProvider/Makefile.redhat 2005-05-12 11:29:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/ControlProviders/CertificateProvider/Makefile 2005-10-03 17:12:17.000000000 -0400 -@@ -56,8 +56,8 @@ - ifeq ($(OS),linux) - EXTRA_LIBRARIES += -lcrypt - ifdef PEGASUS_HAS_SSL -- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto -- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib -+ EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) -lssl -lcrypto -+ EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) - endif - endif - ---- pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile.redhat 2005-05-12 11:28:46.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile 2005-10-03 17:12:17.000000000 -0400 -@@ -45,7 +45,7 @@ - ifeq ($(PEGASUS_OS_TYPE),VMS) - $(PROGRAM) libTestDynLib - else -- $(PROGRAM) $(HOME_DIR)/lib/libTestDynLib$(LIB_SUFFIX) -+ $(PROGRAM) $(HOME_DIR)/$(PEGASUS_ARCH_LIB_DIR)/libTestDynLib$(LIB_SUFFIX) - endif - endif - ---- pegasus-2.5/src/Pegasus/Common/MessageQueueService.cpp.redhat 2005-08-16 18:46:53.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/MessageQueueService.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -68,7 +68,9 @@ - - #define MAX_THREADS_PER_SVC_QUEUE_LIMIT 5000 - #define MAX_THREADS_PER_SVC_QUEUE_DEFAULT 5 -- -+#ifndef MAX_THREADS_PER_SVC_QUEUE -+#define MAX_THREADS_PER_SVC_QUEUE MAX_THREADS_PER_SVC_QUEUE_DEFAULT -+#endif - Uint32 max_threads_per_svc_queue; - - PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL ---- pegasus-2.5/src/Pegasus/Common/Makefile.redhat 2005-06-12 18:31:19.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/Makefile 2005-10-03 17:12:17.000000000 -0400 -@@ -165,8 +165,8 @@ - ifeq ($(OS),linux) - EXTRA_LIBRARIES += -lcrypt - ifdef PEGASUS_HAS_SSL -- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto -- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib -+ EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) -lssl -lcrypto -+ EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) - endif - endif - -@@ -206,11 +206,11 @@ - ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC) - SYS_LIBS = ws2_32.lib advapi32.lib netapi32.lib - ifdef PEGASUS_HAS_SSL -- SYS_LIBS += /libpath:$(OPENSSL_HOME)/lib libeay32.lib ssleay32.lib -+ SYS_LIBS += /libpath:$(OPENSSL_HOME)/$(PEGASUS_ARCH_LIB_DIR) libeay32.lib ssleay32.lib - endif - ifdef PEGASUS_WINDOWS_SDK_HOME - FLAGS += -DPEGASUS_WINDOWS_SDK_HOME -- SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/lib secur32.lib -+ SYS_LIBS += /libpath:$(PEGASUS_WINDOWS_SDK_HOME)/$(PEGASUS_ARCH_LIB_DIR) secur32.lib - else - ifneq ($(CL_MAJOR_VERSION), 12) - SYS_LIBS += secur32.lib ---- pegasus-2.5/src/Pegasus/Common/Constants.h.redhat 2005-07-27 17:02:36.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/Constants.h 2005-10-03 17:12:17.000000000 -0400 -@@ -380,21 +380,21 @@ - # define PEGASUS_PAM_STANDALONE_PROC_NAME "/opt/freeware/cimom/pegasus/bin/cimservera" - # elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB) - # undef PEGASUS_SSLCLIENT_CERTIFICATEFILE --# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem" -+# define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/Pegasus/client.pem" - # undef PEGASUS_SSLCLIENT_RANDOMFILE --# define PEGASUS_SSLCLIENT_RANDOMFILE "/var/opt/tog-pegasus/ssl.rnd" -+# define PEGASUS_SSLCLIENT_RANDOMFILE "/var/lib/Pegasus/ssl.rnd" - # undef PEGASUS_SSLSERVER_RANDOMFILE --# define PEGASUS_SSLSERVER_RANDOMFILE "/var/opt/tog-pegasus/cimserver.rnd" -+# define PEGASUS_SSLSERVER_RANDOMFILE "/var/lib/Pegasus/cimserver.rnd" - # undef PEGASUS_LOCAL_AUTH_DIR --# define PEGASUS_LOCAL_AUTH_DIR "/var/opt/tog-pegasus/cache/localauth" -+# define PEGASUS_LOCAL_AUTH_DIR "/var/lib/Pegasus/cache/localauth" - # undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH --# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH "/var/run/tog-pegasus/socket/cimxml.socket" -+# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH "/var/run/tog-pegasus/cimxml.socket" - # undef PEGASUS_CORE_DIR --# define PEGASUS_CORE_DIR "/var/opt/tog-pegasus/cache" -+# define PEGASUS_CORE_DIR "/var/lib/Pegasus/cache" - # undef PEGASUS_PAM_STANDALONE_PROC_NAME --# define PEGASUS_PAM_STANDALONE_PROC_NAME "/opt/tog-pegasus/sbin/cimservera" -+# define PEGASUS_PAM_STANDALONE_PROC_NAME "/usr/sbin/cimservera" - # undef PEGASUS_PROVIDER_AGENT_PROC_NAME --# define PEGASUS_PROVIDER_AGENT_PROC_NAME "/opt/tog-pegasus/sbin/cimprovagt" -+# define PEGASUS_PROVIDER_AGENT_PROC_NAME "/usr/sbin/cimprovagt" - # elif defined(PEGASUS_OS_LSB) - # define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem" - # undef PEGASUS_SSLCLIENT_RANDOMFILE ---- pegasus-2.5/src/Pegasus/Common/System.cpp.redhat 2005-06-06 10:27:55.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/System.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -144,13 +144,13 @@ - char *System::extract_file_path(const char *fullpath, char *dirname) - { - char *p; -- char buff[2048]; -+ char buff[PEGASUS_PATH_MAX]; - if (fullpath == NULL) - { - dirname[0] = '\0'; - return dirname; - } -- strcpy(buff, fullpath); -+ strncpy(buff, fullpath, PEGASUS_PATH_MAX); - for(p = buff + strlen(buff); p >= buff; p--) - { - if (*p == '\\' || *p == '/') ---- pegasus-2.5/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h.redhat 2005-02-26 00:22:13.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2005-10-03 17:12:17.000000000 -0400 -@@ -72,9 +72,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -- -+#include // For _POSIX_HOST_NAME_LEN - #if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#if defined(_POSIX_HOST_NAME_MAX) -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX+1) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 256 -+#endif - #endif -- - #endif /* Pegasus_Platform_LINUX_IX86_GNU_h */ ---- pegasus-2.5/src/Pegasus/Common/SystemUnix.cpp.redhat 2005-07-19 15:31:26.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/SystemUnix.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -566,7 +566,7 @@ - - if ((he = gethostbyname (hostName))) - { -- strcpy (hostName, he->h_name); -+ strncpy (hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); - } - - #if defined(PEGASUS_OS_OS400) ---- pegasus-2.5/src/Pegasus/Common/Config.h.redhat 2005-05-05 14:18:42.000000000 -0400 -+++ pegasus-2.5/src/Pegasus/Common/Config.h 2005-10-03 17:12:17.000000000 -0400 -@@ -182,6 +182,13 @@ - #define PEGASUS_MAXHOSTNAMELEN MAXHOSTNAMELEN - #endif - -+#ifndef PEGASUS_PATH_MAX -+#ifndef PATH_MAX -+#define PEGASUS_PATH_MAX 4096 -+#else -+#define PEGASUS_PATH_MAX PATH_MAX -+#endif -+#endif - - #ifdef __cplusplus - PEGASUS_NAMESPACE_BEGIN ---- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp.redhat 2005-03-02 13:17:32.000000000 -0500 -+++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -310,7 +310,7 @@ - he=gethostbyname(hostName); - if (he) - { -- strcpy(hostName, he->h_name); -+ strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); - } - - _hostName.assign(hostName); ---- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp.redhat 2005-02-05 18:01:03.000000000 -0500 -+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -172,7 +172,7 @@ - he=gethostbyname(hostName); - if (he) - { -- strcpy(hostName, he->h_name); -+ strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); - } - - csName.assign(hostName); ---- pegasus-2.5/src/Providers/ManagedSystem/Process/Process_Linux.cpp.redhat 2005-07-15 16:46:54.000000000 -0400 -+++ pegasus-2.5/src/Providers/ManagedSystem/Process/Process_Linux.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -782,7 +782,7 @@ - he=gethostbyname(hostName); - if (he) - { -- strcpy(hostName, he->h_name); -+ strncpy(hostName, he->h_name, PEGASUS_MAXHOSTNAMELEN); - } - - csName.assign(hostName); ---- pegasus-2.5/src/Clients/repupgrade/RepositoryUpgrade.cpp.redhat 2005-06-03 16:04:34.000000000 -0400 -+++ pegasus-2.5/src/Clients/repupgrade/RepositoryUpgrade.cpp 2005-10-03 17:12:17.000000000 -0400 -@@ -2075,7 +2075,7 @@ - fileName = _pegasusHome + "/bin/" + - FileSystem::buildLibraryFileName(moduleName); - #else -- fileName = _pegasusHome + "/lib/" + -+ fileName = _pegasusHome + PEGASUS_DEST_LIB_DIR + - FileSystem::buildLibraryFileName(moduleName); - #endif - diff --git a/pegasus-2.5-syslog_h.patch b/pegasus-2.5-syslog_h.patch deleted file mode 100644 index 467d9d9..0000000 --- a/pegasus-2.5-syslog_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.syslog_h 2006-02-07 17:31:36.000000000 -0500 -+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2006-02-07 17:34:57.000000000 -0500 -@@ -46,6 +46,8 @@ - #include - #endif - -+#include -+ - #if defined (PEGASUS_USE_PAM_STANDALONE_PROC) - #include - #include diff --git a/pegasus-2.5.1-AutoPtr-Core.patch b/pegasus-2.5.1-AutoPtr-Core.patch deleted file mode 100644 index 8bea231..0000000 --- a/pegasus-2.5.1-AutoPtr-Core.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- pegasus/src/Pegasus/Common/AutoPtr.h.AutoPtr-Core 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AutoPtr.h 2006-04-11 15:01:43.000000000 -0400 -@@ -200,7 +200,8 @@ - { - if (p != _ptr) - { -- delete _ptr; -+ if ( _ptr != 0 ) -+ delete _ptr; - _ptr = p; - } - } diff --git a/pegasus-2.5.1-HOSTNAME_MAX.patch b/pegasus-2.5.1-HOSTNAME_MAX.patch deleted file mode 100644 index d46e991..0000000 --- a/pegasus-2.5.1-HOSTNAME_MAX.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- pegasus/src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h 2006-04-14 18:41:28.000000000 -0400 -@@ -72,9 +72,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_IA64_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_IA64_GNU.h 2006-04-14 18:37:02.000000000 -0400 -@@ -69,9 +69,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h 2006-04-14 18:40:02.000000000 -0400 -@@ -69,9 +69,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_X86_64_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_X86_64_GNU.h 2006-04-14 18:38:18.000000000 -0400 -@@ -73,9 +73,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_PPC_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_PPC_GNU.h 2006-04-14 18:38:50.000000000 -0400 -@@ -73,9 +73,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_IX86_GNU.h 2006-04-14 18:37:23.000000000 -0400 -@@ -74,9 +74,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES64_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_ZSERIES64_GNU.h 2006-04-14 18:40:30.000000000 -0400 -@@ -70,8 +70,12 @@ - #include - #include // For MAXHOSTNAMELEN - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#include -+ -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t ---- pegasus/src/Pegasus/Common/Platform_LINUX_PPC64_GNU.h.HOSTNAME_MAX 2006-01-30 11:17:07.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Platform_LINUX_PPC64_GNU.h 2006-04-14 18:39:13.000000000 -0400 -@@ -73,9 +73,12 @@ - #include - #include - #include // For MAXHOSTNAMELEN -+#include - --#if defined(PEGASUS_OS_LSB) && !defined(MAXHOSTNAMELEN) --#define PEGASUS_MAXHOSTNAMELEN 64 -+#ifdef _POSIX_HOST_NAME_MAX -+#define PEGASUS_MAXHOSTNAMELEN (_POSIX_HOST_NAME_MAX) -+#else -+#define PEGASUS_MAXHOSTNAMELEN 255 - #endif - - #define PEGASUS_SOCKLEN_T socklen_t diff --git a/pegasus-2.5.1-PATH_MAX.patch b/pegasus-2.5.1-PATH_MAX.patch deleted file mode 100644 index f578a5f..0000000 --- a/pegasus-2.5.1-PATH_MAX.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- pegasus/src/Pegasus/Common/System.cpp.PATH_MAX 2006-01-30 11:17:08.000000000 -0500 -+++ pegasus/src/Pegasus/Common/System.cpp 2006-04-14 18:19:27.000000000 -0400 -@@ -185,13 +185,13 @@ - char *System::extract_file_path(const char *fullpath, char *dirname) - { - char *p; -- char buff[2048]; -+ char buff[PATH_MAX]; - if (fullpath == NULL) - { - dirname[0] = '\0'; - return dirname; - } -- strcpy(buff, fullpath); -+ strncpy(buff, fullpath, PATH_MAX); - for(p = buff + strlen(buff); p >= buff; p--) - { - if (*p == '\\' || *p == '/') diff --git a/pegasus-2.5.1-PIE.patch b/pegasus-2.5.1-PIE.patch deleted file mode 100644 index 2c38aa0..0000000 --- a/pegasus-2.5.1-PIE.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile.PIE 2006-01-30 11:17:34.000000000 -0500 -+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile 2006-04-06 16:17:54.000000000 -0400 -@@ -32,6 +32,8 @@ - DIR = Pegasus/Compiler/cmdline/cimmof - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY - - LIBRARIES = \ ---- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile.PIE 2006-01-30 11:17:34.000000000 -0500 -+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile 2006-04-06 16:17:43.000000000 -0400 -@@ -32,6 +32,8 @@ - DIR = Pegasus/Compiler/cmdline/cimmofl - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY - - PROGRAM = cimmofl ---- pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile.PIE 2006-01-30 11:18:16.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/ProviderAgent/Makefile 2006-04-05 21:05:58.000000000 -0400 -@@ -29,11 +29,12 @@ - #// - #//============================================================================== - ROOT = ../../../.. -- - DIR = Pegasus/ProviderManager2/ProviderAgent - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegprovidermanager \ - pegprovider \ -@@ -56,4 +57,3 @@ - tests: - - poststarttests: -- ---- pegasus/src/Server/Makefile.PIE 2006-01-30 11:19:33.000000000 -0500 -+++ pegasus/src/Server/Makefile 2006-04-05 21:05:58.000000000 -0400 -@@ -30,8 +30,11 @@ - #//============================================================================== - ROOT = ../.. - DIR = Server -+ - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegclient \ - pegserver \ ---- pegasus/src/Clients/cimprovider/Makefile.PIE 2006-01-30 11:16:33.000000000 -0500 -+++ pegasus/src/Clients/cimprovider/Makefile 2006-04-06 16:17:31.000000000 -0400 -@@ -36,6 +36,8 @@ - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegcliutils \ - pegclient \ ---- pegasus/src/Clients/osinfo/Makefile.PIE 2006-01-30 11:16:35.000000000 -0500 -+++ pegasus/src/Clients/osinfo/Makefile 2006-04-06 16:17:14.000000000 -0400 -@@ -35,6 +35,8 @@ - DIR = Clients/osinfo - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegcliutils \ - peggetoopt \ ---- pegasus/src/Clients/cimuser/Makefile.PIE 2006-01-30 11:16:33.000000000 -0500 -+++ pegasus/src/Clients/cimuser/Makefile 2006-04-06 16:17:01.000000000 -0400 -@@ -36,6 +36,8 @@ - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegcliutils \ - pegclient \ ---- pegasus/src/Clients/repupgrade/Makefile.PIE 2006-01-30 11:16:36.000000000 -0500 -+++ pegasus/src/Clients/repupgrade/Makefile 2006-04-06 16:16:37.000000000 -0400 -@@ -36,6 +36,8 @@ - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LOCAL_DEFINES = -DPEGASUS_INTERNALONLY - - LIBRARIES = \ ---- pegasus/src/Clients/cimauth/Makefile.PIE 2006-01-30 11:16:32.000000000 -0500 -+++ pegasus/src/Clients/cimauth/Makefile 2006-04-06 16:16:17.000000000 -0400 -@@ -36,6 +36,8 @@ - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegcliutils \ - pegclient \ ---- pegasus/src/Clients/cimconfig/Makefile.PIE 2006-01-30 11:16:32.000000000 -0500 -+++ pegasus/src/Clients/cimconfig/Makefile 2006-04-06 16:15:59.000000000 -0400 -@@ -36,6 +36,8 @@ - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - LIBRARIES = \ - pegcliutils \ - pegclient \ ---- pegasus/src/Clients/wbemexec/Makefile.PIE 2006-01-30 11:16:37.000000000 -0500 -+++ pegasus/src/Clients/wbemexec/Makefile 2006-04-06 16:15:23.000000000 -0400 -@@ -36,6 +36,8 @@ - - include $(ROOT)/mak/config.mak - -+FLAGS := $(FLAGS:-fPIC=-fPIE) -+ - ifdef PEGASUS_HAS_SSL - FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE - SYS_INCLUDES += -I$(OPENSSL_HOME)/include diff --git a/pegasus-2.5.1-bz198185.patch b/pegasus-2.5.1-bz198185.patch deleted file mode 100644 index 7be23d7..0000000 --- a/pegasus-2.5.1-bz198185.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pegasus/src/Pegasus/Common/Makefile.bz198185 2006-07-19 16:21:06.000000000 -0400 -+++ pegasus/src/Pegasus/Common/Makefile 2006-07-19 19:19:42.000000000 -0400 -@@ -183,7 +183,7 @@ - SOURCES = $(SOURCES1) $(SOURCES2) - - ifeq ($(OS),linux) -- EXTRA_LIBRARIES += -lcrypt -+ EXTRA_LIBRARIES += -lcrypt -lpthread - ifdef PEGASUS_HAS_SSL - EXTRA_LIBRARIES += -lssl -lcrypto - endif diff --git a/pegasus-2.5.1-cmpi-provider-lib.patch b/pegasus-2.5.1-cmpi-provider-lib.patch deleted file mode 100644 index 8ad6b84..0000000 --- a/pegasus-2.5.1-cmpi-provider-lib.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.cmpi_provider_lib 2006-03-14 16:06:37.000000000 -0500 -+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h 2006-04-05 20:06:55.000000000 -0400 -@@ -65,8 +65,8 @@ - {"crlStore", PEGASUS_SSL_SERVER_CRL}, - #endif - {"repositoryDir", PEGASUS_REPOSITORY_DIR}, -- {"providerDir", PEGASUS_PROVIDER_LIB_DIR":/usr/lib/cmpi"}, --#else -+ {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"}, -+#else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */ - {"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"}, - #if !defined(PEGASUS_USE_SYSLOGS) - {"logdir", "/var/opt/tog-pegasus/log"}, -@@ -84,8 +84,8 @@ - {"providerDir", "/opt/tog-pegasus/providers/lib"}, - #endif - {"messageDir", "/opt/tog-pegasus/share/locale/ICU_Messages"}, --#endif --#endif -+#endif /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */ -+#endif /* defined(PEGASUS_USE_RELEASE_DIRS) && !defined(PEGASUS_OS_LSB) */ - #if defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LSB) - {"traceFilePath", "/var/opt/lsb-pegasus/cache/cimserver.trc"}, - #if !defined(PEGASUS_USE_SYSLOGS) diff --git a/pegasus-2.5.1-enable_cql.patch b/pegasus-2.5.1-enable_cql.patch deleted file mode 100644 index 2de5781..0000000 --- a/pegasus-2.5.1-enable_cql.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- pegasus/env_var_Linux.status.enable-cql 2006-03-15 20:33:51.000000000 -0500 -+++ pegasus/env_var_Linux.status 2006-04-06 15:19:35.000000000 -0400 -@@ -18,7 +18,7 @@ - PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir - endif - --PEGASUS_DISABLE_CQL=true -+PEGASUS_ENABLE_CQL=true - PEGASUS_DISABLE_OBJECT_NORMALIZATION=true - PEGASUS_DISABLE_PERFINST=yes - PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true -@@ -26,7 +26,6 @@ - PEGASUS_HAS_SSL=yes - PEGASUS_NOASSERTS=yes - PEGASUS_PAM_AUTHENTICATION=true --PEGASUS_USE_PAM_STANDALONE_PROC=true - PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true - PEGASUS_USE_RELEASE_DIRS=true - PEGASUS_USE_SYSLOGS=true -@@ -64,9 +63,10 @@ - PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth - PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace - PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc -+PEGASUS_CONFIG_DIR = /etc/Pegasus - PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf - PEGASUS_PLANNED_CONFIG_FILE_PATH = \ -- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE) -+ $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE) - PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf - PEGASUS_CURRENT_CONFIG_FILE_PATH = \ - $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE) -@@ -74,8 +74,6 @@ - PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log - PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log - --PEGASUS_CONFIG_DIR = /etc/Pegasus -- - PEGASUS_VARRUN_DIR = /var/run/tog-pegasus - PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid - CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock diff --git a/pegasus-2.5.1-fix_repupgrade.patch b/pegasus-2.5.1-fix_repupgrade.patch deleted file mode 100644 index 1434687..0000000 --- a/pegasus-2.5.1-fix_repupgrade.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- pegasus/src/Clients/repupgrade/RepositoryUpgrade.cpp.fix_repupgrade 2006-01-31 14:34:30.000000000 -0500 -+++ pegasus/src/Clients/repupgrade/RepositoryUpgrade.cpp 2006-04-17 16:09:24.000000000 -0400 -@@ -295,9 +295,9 @@ - const String NEW_REPOSITORY_PATH = "/wbem_var/opt/wbem/repository"; - const String RepositoryUpgrade::_LOG_PATH = "/wbem_var/opt/wbem/upgrade"; - #elif defined(PEGASUS_USE_RELEASE_DIRS) && defined(PEGASUS_OS_LINUX) -- const String OLD_REPOSITORY_PATH = "/var/opt/tog-pegasus/prev_repository"; -- const String NEW_REPOSITORY_PATH = "/var/opt/tog-pegasus/repository"; -- const String RepositoryUpgrade::_LOG_PATH = "/var/opt/tog-pegasus/log/upgrade"; -+ const String OLD_REPOSITORY_PATH = "/var/lib/Pegasus/prev_repository"; -+ const String NEW_REPOSITORY_PATH = "/var/lib/Pegasus/repository"; -+ const String RepositoryUpgrade::_LOG_PATH = "/var/lib/Pegasus/log/install.log"; - #define REPUPGRADE_USE_RELEASE_DIRS true - #else - const String RepositoryUpgrade::_LOG_PATH diff --git a/pegasus-2.5.1-fix_zseries_flags.patch b/pegasus-2.5.1-fix_zseries_flags.patch deleted file mode 100644 index 49b86a2..0000000 --- a/pegasus-2.5.1-fix_zseries_flags.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak.fix_zseries_flags 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/platform_LINUX_ZSERIES64_GNU.mak 2006-04-10 20:10:04.000000000 -0400 -@@ -35,4 +35,4 @@ - - ARCHITECTURE = zseries - --FLAGS = -fsigned-char -+FLAGS += -fsigned-char ---- pegasus/mak/platform_LINUX_ZSERIES_GNU.mak.fix_zseries_flags 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/platform_LINUX_ZSERIES_GNU.mak 2006-04-10 20:09:41.000000000 -0400 -@@ -35,4 +35,4 @@ - - ARCHITECTURE = zseries - --FLAGS = -fsigned-char -+FLAGS += -fsigned-char diff --git a/pegasus-2.5.1-linkflags.patch b/pegasus-2.5.1-linkflags.patch deleted file mode 100644 index e44dad3..0000000 --- a/pegasus-2.5.1-linkflags.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- pegasus/mak/library.mak.linkflags 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/library.mak 2006-04-05 17:11:23.000000000 -0400 -@@ -40,6 +40,10 @@ - - include $(ROOT)/mak/common.mak - -+ifdef PEGASUS_EXTRA_LIBRARY_LINK_FLAGS -+ EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_LIBRARY_LINK_FLAGS) -+endif -+ - ################################################################################ - ## - ## Build list of object names. ---- pegasus/mak/program.mak.linkflags 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/program.mak 2006-04-05 17:10:37.000000000 -0400 -@@ -38,6 +38,10 @@ - - include $(ROOT)/mak/common.mak - -+ifdef PEGASUS_EXTRA_PROGRAM_LINK_FLAGS -+ EXTRA_LINK_FLAGS = $(PEGASUS_EXTRA_PROGRAM_LINK_FLAGS) -+endif -+ - ifeq ($(OS_TYPE),windows) - include $(ROOT)/mak/program-windows.mak - endif diff --git a/pegasus-2.5.1-local-or-remote-auth.patch b/pegasus-2.5.1-local-or-remote-auth.patch deleted file mode 100644 index b70a606..0000000 --- a/pegasus-2.5.1-local-or-remote-auth.patch +++ /dev/null @@ -1,439 +0,0 @@ ---- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth 2006-03-10 18:18:37.000000000 -0500 -+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2006-04-05 20:35:40.000000000 -0400 -@@ -384,6 +384,9 @@ - } - } - -+ // Let Authenticators know whether this user is Local or Remote: -+ httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost ); -+ - // - // Handle authentication: - // ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2006-04-05 20:40:40.000000000 -0400 -@@ -48,6 +48,8 @@ - #include - #endif - -+#include -+ - #if defined (PEGASUS_USE_PAM_STANDALONE_PROC) - #include - #include -@@ -131,7 +133,8 @@ - - Boolean PAMBasicAuthenticator::authenticate( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::authenticate()"); -@@ -139,7 +142,7 @@ - Boolean authenticated; - - #if !defined(PEGASUS_USE_PAM_STANDALONE_PROC) -- authenticated = _authenticateByPAM(userName, password); -+ authenticated = _authenticateByPAM(userName, password, isRemoteUser); - #else - // - // Mutex to Serialize Authentication calls. -@@ -147,8 +150,9 @@ - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "Authentication Mutex lock."); - AutoMutex lock(_authSerializeMutex); -- authenticated = _pamBasicAuthenticatorStandAlone.authenticate( -- userName, password); -+ authenticated = -+ _pamBasicAuthenticatorStandAlone->authenticate(userName, -+ password); - #endif - - PEG_METHOD_EXIT(); -@@ -157,7 +161,8 @@ - - Boolean PAMBasicAuthenticator::_authenticateByPAM( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::_authenticateByPAM()"); -@@ -167,6 +172,7 @@ - pam_handle_t *phandle; - char *name; - APP_DATA mydata; -+ int retcode; - - // - // Store the password for PAM authentication -@@ -180,13 +186,31 @@ - // Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - // "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s", - // (const char *)userName.getCString(), (const char *)password.getCString()); -+ -+ // NOTE: if any pam call should log anything, our syslog socket will be redirected -+ // to the AUTH facility, so we need to redirect it back after each pam call. - - // - //Call pam_start since you need to before making any other PAM calls - // -- if ( ( pam_start(service, -+ -+ if ( (retcode = pam_start(service, - (const char *)userName.getCString(), &pconv, &phandle) ) != PAM_SUCCESS ) - { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_start failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } -+ -+ -+ if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS ) -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } -@@ -194,7 +218,7 @@ - // - //Call pam_authenticate to authenticate the user - // -- if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) -+ if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) - { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "pam_authenticate successful."); -@@ -203,22 +227,40 @@ - //checking for password and account expiration, as well as verifying access - //hour restrictions. - // -- if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) -+ -+ if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) - { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "pam_acct_mgmt successful."); - authenticated = true; -- } -+ }else -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(phandle, retcode)); -+ } -+ }else -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(phandle, retcode)); - } -- - // - //Call pam_end to end our PAM work - // - pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); - -- PEG_METHOD_EXIT(); -+ if ( ! authenticated ) -+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s", -+ isRemoteUser ? "remote" : "local", -+ (const char*)userName.getCString() -+ ); - -+ PEG_METHOD_EXIT(); - return (authenticated); -+ - } - - Boolean PAMBasicAuthenticator::validateUser(const String& userName) -@@ -233,6 +275,7 @@ - pam_handle_t *phandle; - char *name; - APP_DATA mydata; -+ int retcode; - - const char *service = "wbem"; - pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback; -@@ -241,21 +284,43 @@ - // - // Call pam_start since you need to before making any other PAM calls - // -- if ( pam_start(service, -- (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS) -- { -+ if ( (retcode = -+ pam_start(service,(const char *)userName.getCString(), &pconv, &phandle) -+ ) != PAM_SUCCESS -+ ) -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } - -+ if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS ) -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } - // - // Call pam_acct_mgmt, to check if the user account is valid. This includes - // checking for account expiration, as well as verifying access - // hour restrictions. - // -- if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS ) -- { -+ if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS ) -+ { - authenticated = true; -+ }else -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); - } - - // -@@ -263,6 +328,9 @@ - // - pam_end(phandle, 0); - -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ - #else - // - // Mutex to Serialize Authentication calls. ---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2006-04-05 20:35:40.000000000 -0400 -@@ -67,7 +67,8 @@ - */ - virtual Boolean authenticate( - const String& userName, -- const String& password) = 0; -+ const String& password, -+ Boolean isRemoteUser) = 0; - - /** Construct and return the HTTP Basic authentication challenge header - @return A string containing the authentication challenge header. ---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2006-04-05 20:35:40.000000000 -0400 -@@ -138,7 +138,7 @@ - authInfo->setAuthenticatedUser(userName); - authInfo->setAuthenticatedPassword(password); - #else -- authenticated = _basicAuthenticator->authenticate(userName, password); -+ authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser()); - - if (authenticated) - { ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2006-04-05 20:35:40.000000000 -0400 -@@ -92,7 +92,8 @@ - - Boolean PAMBasicAuthenticator::authenticate( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::authenticate()"); ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2006-04-05 20:35:40.000000000 -0400 -@@ -73,7 +73,8 @@ - */ - Boolean authenticate( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - /** Verify PAM account management for the requesting user. - @param userName String containing the user name -@@ -102,7 +103,8 @@ - - Boolean _authenticateByPAM( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - void _createPAMStandalone(); - -@@ -158,7 +160,8 @@ - */ - Boolean authenticate( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - /** Verify whether the user is valid. - @param userName String containing the user name -@@ -220,7 +223,8 @@ - - Boolean _authenticateByPAM( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - #if defined(PEGASUS_USE_PAM_STANDALONE_PROC) - PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone; ---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2006-04-05 20:35:40.000000000 -0400 -@@ -57,7 +57,8 @@ - _privileged(false), - _authType(String::EMPTY), - _authStatus(NEW_REQUEST), -- _exportConnection(false) -+ _exportConnection(false), -+ _remoteUser(true) - { - PEG_METHOD_ENTER( - TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep"); -@@ -180,5 +181,14 @@ - PEG_METHOD_EXIT(); - } - -+void AuthenticationInfoRep::setRemoteUser(Boolean remoteUser) -+{ -+ PEG_METHOD_ENTER(TRC_AUTHENTICATION, -+ "AuthenticationInfoRep::setRemoteUser"); -+ -+ _remoteUser = remoteUser; -+ -+ PEG_METHOD_EXIT(); -+} - - PEGASUS_NAMESPACE_END ---- pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth 2006-01-30 11:17:04.000000000 -0500 -+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2006-04-05 20:35:40.000000000 -0400 -@@ -119,7 +119,8 @@ - queueId(queueId_), - authInfo(0), - acceptLanguagesDecoded(false), -- contentLanguagesDecoded(false) -+ contentLanguagesDecoded(false), -+ fromRemoteHost(true) - { - if (cimException_) - cimException = *cimException_; ---- pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2006-04-05 20:35:40.000000000 -0400 -@@ -331,6 +331,22 @@ - _rep->setClientCertificateChain(clientCertificate); - } - -+ /** Indicate whether the user is Remote -+ */ -+ Boolean isRemoteUser() const -+ { -+ _checkRep(); -+ return _rep->isRemoteUser(); -+ } -+ -+ /** Set the Remote User flag -+ */ -+ void setRemoteUser(Boolean remoteUser) -+ { -+ _checkRep(); -+ _rep->setRemoteUser(remoteUser); -+ } -+ - private: - - AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep) ---- pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth 2006-02-28 21:21:37.000000000 -0500 -+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2006-04-05 20:35:40.000000000 -0400 -@@ -1828,6 +1828,30 @@ - "_requestCount = %d", _requestCount.get()); - message->dest = _outputMessageQueue->getQueueId(); - // SendForget(message); -+ -+ // Allow authenticators to differentiate Remote and Local users: -+ struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ... -+ socklen_t slen1=sizeof(struct sockaddr_in), slen2=sizeof(struct sockaddr_in); -+ uint32_t sock = _socket.get()->getSocket() ; -+ memset(&sin_peer,'\0',slen1); -+ memset(&sin_svr, '\0',slen2); -+ if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 ) -+ ||( ::getsockname( sock, (struct sockaddr*)&sin_svr, &slen2) == 0 ) -+ ) -+ { -+ if( sin_peer.sin_family == AF_INET ) -+ { -+ if( ((ntohl( sin_peer.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) -+ // message was sent FROM localhost interface -+ message->fromRemoteHost = false; -+ } -+ if( sin_svr.sin_family == AF_INET ) -+ { -+ if( ((ntohl( sin_svr.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) -+ // message was sent TO localhost interface -+ message->fromRemoteHost = false; -+ } -+ } - - // - // Set the entry status to BUSY. ---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2006-04-05 20:37:59.000000000 -0400 -@@ -143,6 +143,14 @@ - - void setExportConnection(Boolean exportConnection); - -+ Boolean isRemoteUser() const -+ { -+ return _remoteUser; -+ } -+ -+ void setRemoteUser(Boolean remoteUser); -+ -+ - //PEP187 - Array getClientCertificateChain() - { -@@ -173,7 +181,8 @@ - #endif - - Boolean _exportConnection; -- Array _clientCertificate; -+ Array _clientCertificate; -+ Boolean _remoteUser; - }; - - PEGASUS_NAMESPACE_END ---- pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth 2006-01-30 11:17:04.000000000 -0500 -+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2006-04-05 20:35:40.000000000 -0400 -@@ -80,7 +80,8 @@ - ContentLanguageList contentLanguages; - Boolean acceptLanguagesDecoded; - Boolean contentLanguagesDecoded; -- CIMException cimException; -+ Boolean fromRemoteHost; -+ CIMException cimException; - - void parse( - String& startLine, diff --git a/pegasus-2.5.1-no-rpath.patch b/pegasus-2.5.1-no-rpath.patch deleted file mode 100644 index 7e73006..0000000 --- a/pegasus-2.5.1-no-rpath.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- pegasus/mak/library-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/library-unix.mak 2006-04-08 18:28:43.000000000 -0400 -@@ -81,14 +81,14 @@ - ifneq ($(PEGASUS_PLATFORM),DARWIN_PPC_GNU) - ifdef PEGASUS_USE_RELEASE_DIRS - LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS) -- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(PEGASUS_DEST_LIB_DIR) -+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) $(EXTRA_LINK_ARGUMENTS) - else - LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS) -- LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS) -+ LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) $(EXTRA_LINK_ARGUMENTS) - endif - else - LINK_COMMAND = $(CXX) -dynamiclib -- LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl -+ LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS) - endif - ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU) - LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS) ---- pegasus/mak/program-unix.mak.no-rpath 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/program-unix.mak 2006-04-08 18:28:43.000000000 -0400 -@@ -30,22 +30,12 @@ - #//============================================================================== - INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) - --ifndef LINK_RPATH -- LINK_RPATH = -Xlinker -rpath --endif -- - LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR) - - LINK_LIB_DIR = -Xlinker $(LIB_DIR) - - LINK_ICU = -Xlinker ${ICU_INSTALL}/lib - --ifndef LINK_RPATH_LINK -- LINK_RPATH_LINK = -Xlinker -rpath-link --endif -- -- -- - TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) - - ifeq ($(OS_TYPE),windows) -@@ -118,9 +108,9 @@ - endif - else - ifdef PEGASUS_USE_RELEASE_DIRS -- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - else -- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) -+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) - endif - endif - else ---- pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile.no-rpath 2006-01-30 11:17:40.000000000 -0500 -+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/Makefile 2006-04-09 02:19:33.000000000 -0400 -@@ -58,8 +58,7 @@ - ifeq ($(OS),linux) - EXTRA_LIBRARIES += -lcrypt - ifdef PEGASUS_HAS_SSL -- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto -- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib -+ EXTRA_LIBRARIES += -lssl -lcrypto - endif - endif - ---- pegasus/src/Pegasus/Common/Makefile.no-rpath 2006-01-30 11:17:05.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Makefile 2006-04-09 02:23:54.000000000 -0400 -@@ -185,8 +185,7 @@ - ifeq ($(OS),linux) - EXTRA_LIBRARIES += -lcrypt - ifdef PEGASUS_HAS_SSL -- EXTRA_LIBRARIES += -L$(OPENSSL_HOME)/lib -lssl -lcrypto -- EXTRA_LINK_ARGUMENTS = -Xlinker -rpath -Xlinker $(OPENSSL_HOME)/lib -+ EXTRA_LIBRARIES += -lssl -lcrypto - endif - endif - diff --git a/pegasus-2.5.1-obz4934.patch b/pegasus-2.5.1-obz4934.patch deleted file mode 100644 index 9db2c98..0000000 --- a/pegasus-2.5.1-obz4934.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp.obz4934 2006-02-28 14:53:30.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp 2006-04-14 17:47:30.000000000 -0400 -@@ -567,8 +567,8 @@ - CIMRequestMessage* request, - CIMResponseMessage* response) - { -- CIMStatusCode code = CIM_ERR_SUCCESS; -- String message; -+ PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, -+ "ProviderManagerService::responseChunkCallback"); - - try - { -@@ -601,25 +601,20 @@ - - op->_async_callback(op, service, op->_callback_ptr); - } -- -- catch(CIMException &e) -- { -- code = e.getCode(); -- message = e.getMessage(); -- } - catch(Exception &e) - { -- code = CIM_ERR_FAILED; -- message = e.getMessage(); -+ PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2, -+ "Exception in ProviderManagerService::responseChunkCallback: " + -+ e.getMessage() + ". Chunk not delivered."); - } - catch(...) - { -- code = CIM_ERR_FAILED; -- message = cimStatusCodeToString(code); -+ PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2, -+ "Exception in ProviderManagerService::responseChunkCallback. " -+ "Chunk not delivered."); - } - -- if (code != CIM_ERR_SUCCESS) -- response->cimException = PEGASUS_CIM_EXCEPTION(code, message); -+ PEG_METHOD_EXIT(); - } - - Message* ProviderManagerService::_processMessage(CIMRequestMessage* request) ---- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz4934 2006-03-14 17:12:21.000000000 -0500 -+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp 2006-04-14 17:24:06.000000000 -0400 -@@ -1770,6 +1770,7 @@ - { - // put back the async request because there are more chunks to come. - op->put_request(asyncRequest); -+ delete asyncReply; - } - else - { diff --git a/pegasus-2.5.1-obz4945.patch b/pegasus-2.5.1-obz4945.patch deleted file mode 100644 index 7d6e45e..0000000 --- a/pegasus-2.5.1-obz4945.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt.obz4945 2006-03-15 16:28:36.000000000 -0500 -+++ pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt 2006-04-14 17:55:22.000000000 -0400 -@@ -1167,8 +1167,11 @@ - - ControlProviders.CertificateProvider.EMPTY_CRL:string {"PGS03312: The certificate revocation list is empty."} - -- ControlProviders.CertificateProvider.TRUSTSTORE_RELOAD_FAILED:string {"PGS03313: Trust store reload failed. Certificate deletion will not be effective until cimserver restart."} -+ ControlProviders.CertificateProvider.TRUSTSTORE_RELOAD_FAILED:string {"PGS03313: Trust store reload failed. Certificate deletion will not be effective until cimserver restart."} - -+ ControlProviders.CertificateProvider.ERROR_WRITING_CERT:string {"PGS03314: Unable to add certificate to truststore. Error while trying to write certificate."} -+ -+ ControlProviders.CertificateProvider.ERROR_WRITING_CRL:string {"PGS03315: Unable to add CRL to truststore. Error while trying to write CRL."} - - // ========================================================== - // Messages for CIMOMHandle ---- pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp.obz4945 2006-03-14 16:06:37.000000000 -0500 -+++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp 2006-04-14 17:55:21.000000000 -0400 -@@ -1384,10 +1384,38 @@ - sprintf(newFileName, "%s", (const char*) certificateFileName.getCString()); - - //use the ssl functions to write out the client x509 certificate -- //TODO: add some error checking here - BIO* outFile = BIO_new(BIO_s_file()); -- BIO_write_filename(outFile, newFileName); -- int i = PEM_write_bio_X509(outFile, xCert); -+ if (outFile == NULL) -+ { -+ PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2, -+ "Unable to add certificate to truststore. " -+ "Error while trying to write certificate, BIO_new returned error"); -+ MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT", -+ "Unable to add certificate to truststore. Error while trying to write certificate."); -+ throw CIMException(CIM_ERR_FAILED, parms); -+ } -+ -+ if (!BIO_write_filename(outFile, newFileName)) -+ { -+ BIO_free_all(outFile); -+ PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2, -+ "Unable to add certificate to truststore. Error while trying to write certificate, " -+ "BIO_write_filename returned error"); -+ MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT", -+ "Unable to add certificate to truststore. Error while trying to write certificate."); -+ throw CIMException(CIM_ERR_FAILED, parms); -+ } -+ if (!PEM_write_bio_X509(outFile, xCert)) -+ { -+ BIO_free_all(outFile); -+ PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2, -+ "Unable to add certificate to truststore. " -+ "Error while trying to write certificate, PEM_write_bio_X509 returned error"); -+ MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CERT", -+ "Unable to add certificate to truststore. Error while trying to write certificate."); -+ throw CIMException(CIM_ERR_FAILED, parms); -+ } -+ - BIO_free_all(outFile); - - if (userName == String::EMPTY) -@@ -1528,10 +1556,39 @@ - sprintf(newFileName, "%s", (const char*) crlFileName.getCString()); - - //use the ssl functions to write out the client x509 certificate -- //TODO: add some error checking here - BIO* outFile = BIO_new(BIO_s_file()); -- BIO_write_filename(outFile, newFileName); -- int i = PEM_write_bio_X509_CRL(outFile, xCrl); -+ if (outFile == NULL) -+ { -+ PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2, -+ "Unable to add CRL to truststore. " -+ "Error while trying to write CRL, BIO_new returned error"); -+ MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL", -+ "Unable to add CRL to truststore. Error while trying to write CRL."); -+ throw CIMException(CIM_ERR_FAILED, parms); -+ } -+ -+ if (!BIO_write_filename(outFile, newFileName)) -+ { -+ BIO_free_all(outFile); -+ PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2, -+ "Unable to add CRL to truststore. " -+ "Error while trying to write CRL, BIO_write_filename returned error"); -+ MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL", -+ "Unable to add CRL to truststore. Error while trying to write CRL."); -+ throw CIMException(CIM_ERR_FAILED, parms); -+ } -+ -+ if (!PEM_write_bio_X509_CRL(outFile, xCrl)) -+ { -+ BIO_free_all(outFile); -+ PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL2, -+ "Unable to add CRL to truststore. " -+ "Error while trying to write CRL, PEM_write_bio_X509_CRL returned error"); -+ MessageLoaderParms parms("ControlProviders.CertificateProvider.ERROR_WRITING_CRL", -+ "Unable to add CRL to truststore. Error while trying to write CRL."); -+ throw CIMException(CIM_ERR_FAILED, parms); -+ } -+ - BIO_free_all(outFile); - - Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, diff --git a/pegasus-2.5.1-obz4955.patch b/pegasus-2.5.1-obz4955.patch deleted file mode 100644 index c9e029b..0000000 --- a/pegasus-2.5.1-obz4955.patch +++ /dev/null @@ -1,605 +0,0 @@ ---- pegasus/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp.obz4955 2006-01-30 11:18:48.000000000 -0500 -+++ pegasus/src/Providers/ManagedSystem/OperatingSystem/OperatingSystem_Linux.cpp 2006-05-02 14:43:14.000000000 -0400 -@@ -96,59 +96,75 @@ - - - /** -- getName method of the Linux implementation for the OS Provider -- -- Calls uname() to get the operating system name. -+ getVendorInfo method for Linux implementation of OS Provider - -+ Gets the system text from vendor's release file - */ --Boolean OperatingSystem::getName(String& osName) -+static void getVendorInfo( -+ String& releaseText, -+ String& nameText ) - { -- String s, buffer_s; -- Uint32 buffer_index; // rexex match index -+ static const Uint32 MAX_RELEASE_STRING_LEN=128; - char info_file[MAXPATHLEN]; -- char buffer[MAXPATHLEN]; -+ char buffer[MAX_RELEASE_STRING_LEN]; - struct stat statBuf; -- FILE *vf; - -- s.clear(); -+ - for (int ii = 0; LINUX_VENDOR_INFO[ii].vendor_name != NULL ; ii++) - { -- memset(info_file, 0, MAXPATHLEN); -- strcat(info_file, "/etc/"); -- strcat(info_file, LINUX_VENDOR_INFO[ii].determining_filename); -- -+ sprintf(info_file, "/etc/%s", -+ LINUX_VENDOR_INFO[ii].determining_filename ); - - // If the file exists in /etc, we know what distro we're in - if (!stat(info_file, &statBuf)) - { -- s.assign(LINUX_VENDOR_INFO[ii].vendor_name); -- s.append(" Distribution"); -+ // Set the default OS name -+ nameText.assign(LINUX_VENDOR_INFO[ii].vendor_name); -+ nameText.append(" Distribution"); - if (LINUX_VENDOR_INFO[ii].optional_string == NULL) - { -- // try to set s to a more descript value from the etc file -- vf = fopen(info_file, "r"); -+ // try to set text to a more descriptive value from the etc file -+ FILE *vf = fopen(info_file, "r"); - if (vf) - { -- if (fgets(buffer, MAXPATHLEN, vf) != NULL) -- { -- buffer_s.assign(buffer); -- -- // parse the text to extract Distribution Name -- buffer_index = buffer_s.find(" release"); -- if ( buffer_index != PEG_NOT_FOUND ) -- { -- // then we have found a valid index into the config file -- s.assign(buffer_s.subString(0,buffer_index)); -- } -+ if (fgets(buffer, MAX_RELEASE_STRING_LEN, vf) != NULL) -+ { -+ String buffer_s = buffer; -+ -+ // parse the text to extract first line -+ Uint32 buffer_index = buffer_s.find( '\n' ); -+ if ( buffer_index != PEG_NOT_FOUND ) -+ { -+ // We have found a valid index into the -+ // release string. Now get just the OS name. -+ releaseText = buffer_s.subString(0,buffer_index); -+ buffer_index = releaseText.find( " release" ); -+ if ( buffer_index != PEG_NOT_FOUND ) -+ { -+ nameText.assign( releaseText.subString(0,buffer_index) ); -+ } -+ } - } - fclose(vf); - } - } -+ break; - } - } -- osName.assign(s); -- return true; -+} -+ -+/** -+ getName method of the Linux implementation for the OS Provider -+ -+ Calls getVendorInfo() to get the operating system name. - -+ */ -+Boolean OperatingSystem::getName(String& osName) -+{ -+ String releaseText; -+ getVendorInfo( releaseText, osName ); -+ -+ return true; - } - - /** -@@ -204,23 +220,24 @@ - /** - getCaption method for Linux implementation of OS Provider - -- Uses a string constant for the Caption. -+ Gets the text from the system's release file. - */ - Boolean OperatingSystem::getCaption(String& caption) - { -- -- caption.assign("The current Operating System"); -- -+ String osName; -+ getVendorInfo( caption, osName ); - return true; - } - -+/** -+ getDescription method for Linux implementation of OS Provider -+ -+ Gets the text from the system's release file. -+ */ - Boolean OperatingSystem::getDescription(String& description) - { -- -- description.assign("This instance reflects the Operating System" -- " on which the CIMOM is executing (as distinguished from instances" -- " of other installed operating systems that could be run)."); -- -+ String osName; -+ getVendorInfo( description, osName ); - return true; - } - ---- pegasus/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/OSTestClient.cpp.obz4955 2006-01-30 11:18:49.000000000 -0500 -+++ pegasus/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/OSTestClient.cpp 2006-05-02 14:45:05.000000000 -0400 -@@ -61,6 +61,8 @@ - # include "OSTestClient_VMS.cpp" - #elif defined (PEGASUS_OS_SOLARIS) - # include "OSTestClient_Solaris.cpp" -+#elif defined (PEGASUS_OS_LINUX) -+# include "OSTestClient_Linux.cpp" - # else - # include "OSTestClient_Stub.cpp" - #endif ---- pegasus/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/OSTestClient_Linux.cpp.obz4955 2006-05-02 14:46:08.000000000 -0400 -+++ pegasus/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/OSTestClient_Linux.cpp 2006-05-02 14:38:31.000000000 -0400 -@@ -0,0 +1,449 @@ -+//%2006//////////////////////////////////////////////////////////////////////// -+// -+// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development -+// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. -+// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; -+// IBM Corp.; EMC Corporation, The Open Group. -+// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; -+// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. -+// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+// EMC Corporation; VERITAS Software Corporation; The Open Group. -+// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+// EMC Corporation; Symantec 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"), to -+// deal in the Software without restriction, including without limitation the -+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+// sell copies of the Software, and to permit persons to whom the Software is -+// furnished to do so, subject to the following conditions: -+// -+// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN -+// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED -+// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -+// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+// 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. -+// -+//============================================================================== -+// -+// -+//%///////////////////////////////////////////////////////////////////////////// -+ -+ -+// This file has the OS-specific routines that will be called to get -+// a validation of the CIM information vs. the current test system -+ -+#include "OSTestClient.h" -+ -+PEGASUS_USING_PEGASUS; -+PEGASUS_USING_STD; -+ -+ -+static const struct -+{ -+ const char *vendor_name; -+ const char *determining_filename; -+ const char *optional_string; -+} LINUX_VENDOR_INFO[] = { -+ { "Caldera", "coas", "Caldera Linux" }, -+ { "Corel", "environment.corel", "Corel Linux" }, -+ { "Debian GNU/Linux", "debian_version", NULL }, -+ { "Mandrake", "mandrake-release", NULL }, -+ { "Red Hat", "redhat-release", NULL }, -+ { "SuSE", "SuSE-release", NULL }, -+ { "Turbolinux", "turbolinux-release", NULL }, -+ { NULL, NULL, NULL } -+}; -+ -+ -+/** -+ getVendorInfo method for Linux implementation of OS Provider -+ -+ Gets the system text from vendor's release file -+ */ -+static void getVendorInfo( -+ String& releaseText, -+ String& nameText ) -+{ -+ static const Uint32 MAX_RELEASE_STRING_LEN=128; -+ char info_file[MAXPATHLEN]; -+ char buffer[MAX_RELEASE_STRING_LEN]; -+ struct stat statBuf; -+ -+ -+ for (int ii = 0; LINUX_VENDOR_INFO[ii].vendor_name != NULL ; ii++) -+ { -+ sprintf(info_file, "/etc/%s", -+ LINUX_VENDOR_INFO[ii].determining_filename ); -+ -+ // If the file exists in /etc, we know what distro we're in -+ if (!stat(info_file, &statBuf)) -+ { -+ // Set the default OS name -+ nameText.assign(LINUX_VENDOR_INFO[ii].vendor_name); -+ nameText.append(" Distribution"); -+ if (LINUX_VENDOR_INFO[ii].optional_string == NULL) -+ { -+ // try to set text to a more descriptive value from the etc file -+ FILE *vf = fopen(info_file, "r"); -+ if (vf) -+ { -+ if (fgets(buffer, MAX_RELEASE_STRING_LEN, vf) != NULL) -+ { -+ String buffer_s = buffer; -+ -+ // parse the text to extract first line -+ Uint32 buffer_index = buffer_s.find( '\n' ); -+ if ( buffer_index != PEG_NOT_FOUND ) -+ { -+ // We have found a valid index into the -+ // release string. Now get just the OS name. -+ releaseText = buffer_s.subString(0,buffer_index); -+ buffer_index = releaseText.find( " release" ); -+ if ( buffer_index != PEG_NOT_FOUND ) -+ { -+ nameText.assign( releaseText.subString(0,buffer_index) ); -+ } -+ } -+ } -+ fclose(vf); -+ } -+ } -+ break; -+ } -+ } -+} -+ -+/** -+ goodCSCreationClassName method for the OS Provider Test Client -+ -+ Checks the specified value against the expected value and -+ returns TRUE if valid, else FALSE. -+ */ -+Boolean OSTestClient::goodCSCreationClassName(const String &cs_ccn, -+ Boolean verbose) -+{ -+ // This assumes the only right answer is CIM_UnitaryComputerSystem -+ // replace with approprate check for the given OS/Provider -+ -+ if (verbose) -+ cout<<"Checking " < 0) - { -- Uint32 capacity = (Uint32)(_contentLength + _contentOffset + 1); -- _incomingBuffer.reserveCapacity(capacity); -- data = (char *)_incomingBuffer.getData(); -- data[capacity-1] = 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"); -+ } - } - - break; ---- pegasus/src/Pegasus/Common/String.cpp.obz4956 2006-05-02 14:27:39.000000000 -0400 -+++ pegasus/src/Pegasus/Common/String.cpp 2006-05-02 15:12:59.000000000 -0400 -@@ -51,6 +51,10 @@ - #include - #endif - -+#ifndef PEGASUS_CHECK_FOR_OVERFLOW -+#define PEGASUS_CHECK_FOR_OVERFLOW(capacity) { if (capacity > 0x3FFFFFFF) throw PEGASUS_STD(bad_alloc)(); } -+#endif -+ - PEGASUS_NAMESPACE_BEGIN - - //============================================================================== -@@ -166,8 +170,7 @@ - { - #ifndef PEGASUS_STRING_NO_THROW - -- if (x > 0x0FFFFFFF) -- throw PEGASUS_STD(bad_alloc)(); -+ PEGASUS_CHECK_FOR_OVERFLOW(x); - - #endif - -@@ -545,9 +548,7 @@ - { - #ifndef PEGASUS_STRING_NO_THROW - -- // Any string bigger than this is seriously suspect. -- if (cap > 0x0FFFFFFF) -- throw PEGASUS_STD(bad_alloc)(); -+ PEGASUS_CHECK_FOR_OVERFLOW(cap); - - #endif - ---- pegasus/src/Pegasus/Common/Buffer.cpp.obz4956 2006-03-17 13:59:03.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Buffer.cpp 2006-05-02 15:06:06.000000000 -0400 -@@ -43,11 +43,17 @@ - - 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); -+ - x--; - x |= (x >> 1); - x |= (x >> 2); -@@ -132,7 +138,10 @@ - _rep->size = 0; - } - else -+ { -+ PEGASUS_CHECK_FOR_OVERFLOW(_rep->cap); - _rep = _reallocate(_rep, _rep->cap ? (2 * _rep->cap) : MIN_CAPACITY); -+ } - } - - void Buffer::insert(size_t pos, const char* data, size_t size) diff --git a/pegasus-2.5.1-obz4968_upcalls_oop.patch b/pegasus-2.5.1-obz4968_upcalls_oop.patch deleted file mode 100644 index 0109ee2..0000000 --- a/pegasus-2.5.1-obz4968_upcalls_oop.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Broker.cpp.obz4968_upcalls_oop 2006-03-15 07:53:08.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Broker.cpp 2006-05-02 14:29:16.000000000 -0400 -@@ -313,8 +313,18 @@ - CM_ObjectPath(cop)->getNameSpace(), - CM_ObjectPath(cop)->getClassName()); - if (rc) CMSetStatus(rc,CMPI_RC_OK); -- CMPI_Object *obj = -- new CMPI_Object(new CMPI_OpEnumeration(new Array(en))); -+ -+ // When running out of process the returned instances don't contain -+ // a name space. Create a writable copy of the array and add the -+ // namespace from the input parameters. -+ Array * aObj = new Array(en); -+ for (unsigned int index=0;index < aObj->size(); index++) -+ { -+ (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace()); -+ } -+ -+ CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj)); -+ - return (CMPI_OpEnumeration *)obj->getHdl(); - - } -@@ -408,8 +418,18 @@ - role ? String(role) : String::EMPTY, - resultRole ? String(resultRole) : String::EMPTY); - if (rc) CMSetStatus(rc,CMPI_RC_OK); -- CMPI_Object *obj = -- new CMPI_Object(new CMPI_OpEnumeration(new Array(en))); -+ -+ // When running out of process the returned instances don't contain -+ // a name space. Create a writable copy of the array and add the -+ // namespace from the input parameters. -+ Array * aObj = new Array(en); -+ for (unsigned int index=0;index < aObj->size(); index++) -+ { -+ (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace()); -+ } -+ -+ CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj)); -+ - return (CMPI_OpEnumeration *)obj->getHdl(); - } - catch (const CIMException &e) { -@@ -493,8 +513,18 @@ - resultClass ? CIMName(resultClass) : CIMName(), - role ? String(role) : String::EMPTY); - if (rc) CMSetStatus(rc,CMPI_RC_OK); -- CMPI_Object *obj = -- new CMPI_Object(new CMPI_OpEnumeration(new Array(en))); -+ -+ // When running out of process the returned instances don't contain -+ // a name space. Create a writable copy of the array and add the -+ // namespace from the input parameters. -+ Array * aObj = new Array(en); -+ for (unsigned int index=0;index < aObj->size(); index++) -+ { -+ (*aObj)[index].setNameSpace(CM_ObjectPath(cop)->getNameSpace()); -+ } -+ -+ CMPI_Object *obj = new CMPI_Object(new CMPI_OpEnumeration(aObj)); -+ - return (CMPI_OpEnumeration *)obj->getHdl(); - } - catch (const CIMException &e) { diff --git a/pegasus-2.5.1-obz4978.patch b/pegasus-2.5.1-obz4978.patch deleted file mode 100644 index ee6e6a2..0000000 --- a/pegasus-2.5.1-obz4978.patch +++ /dev/null @@ -1,313 +0,0 @@ ---- pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpIndicationHandler.cpp.obz4978 2006-01-30 11:17:54.000000000 -0500 -+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpIndicationHandler.cpp 2006-05-02 15:23:37.000000000 -0400 -@@ -62,9 +62,54 @@ - - PEGASUS_USING_STD; - -+#ifdef HPUX_EMANATE -+ static snmpDeliverTrap_emanate snmpTrap; -+#elif defined (PEGASUS_USE_NET_SNMP) -+ static snmpDeliverTrap_netsnmp snmpTrap; -+#else -+ static snmpDeliverTrap_stub snmpTrap; -+#endif -+ -+snmpIndicationHandler::snmpIndicationHandler() -+{ -+ PEG_METHOD_ENTER (TRC_IND_HANDLER, -+ "snmpIndicationHandler::snmpIndicationHandler"); -+ PEG_METHOD_EXIT(); -+} -+ - void snmpIndicationHandler::initialize(CIMRepository* repository) - { -+ PEG_METHOD_ENTER (TRC_IND_HANDLER, -+ "snmpIndicationHandler::initialize"); -+ - _repository = repository; -+ -+#ifdef PEGASUS_USE_NET_SNMP -+ snmpTrap.initialize(); -+#endif -+ -+ PEG_METHOD_EXIT(); -+} -+ -+void snmpIndicationHandler::terminate() -+{ -+ PEG_METHOD_ENTER (TRC_IND_HANDLER, -+ "snmpIndicationHandler::terminate"); -+ -+#ifdef PEGASUS_USE_NET_SNMP -+ snmpTrap.terminate(); -+#endif -+ -+ PEG_METHOD_EXIT(); -+} -+ -+snmpIndicationHandler::~snmpIndicationHandler() -+{ -+ PEG_METHOD_ENTER (TRC_IND_HANDLER, -+ "snmpIndicationHandler::~snmpIndicationHandler"); -+ -+ -+ PEG_METHOD_EXIT(); - } - - // l10n - note: ignoring indication language -@@ -153,14 +198,6 @@ - // trap destination and SNMP type are defined in handlerInstance - // and passing this instance as it is to deliverTrap() call - --#ifdef HPUX_EMANATE -- static snmpDeliverTrap_emanate emanateTrap; --#elif defined (PEGASUS_USE_NET_SNMP) -- static snmpDeliverTrap_netsnmp emanateTrap; --#else -- static snmpDeliverTrap_stub emanateTrap; --#endif -- - Uint32 targetHostPos = handler.findProperty(CIMName ("TargetHost")); - Uint32 targetHostFormatPos = handler.findProperty(CIMName ("TargetHostFormat")); - Uint32 otherTargetHostFormatPos = handler.findProperty(CIMName ( -@@ -263,7 +300,7 @@ - handler.getProperty(engineIDPos).getValue().get(engineID); - } - -- emanateTrap.deliverTrap( -+ snmpTrap.deliverTrap( - trapOid, - securityName, - targetHost, -@@ -315,6 +352,8 @@ - MessageLoaderParms("Handler.snmpIndicationHandler.snmpIndicationHandler.FAILED_TO_DELIVER_TRAP", - "Failed to deliver trap.")); - } -+ -+ PEG_METHOD_EXIT(); - } - - // This is the dynamic entry point into this dynamic module. The name of ---- pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.cpp.obz4978 2006-01-30 11:17:54.000000000 -0500 -+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.cpp 2006-05-02 15:23:37.000000000 -0400 -@@ -41,6 +41,49 @@ - - PEGASUS_NAMESPACE_BEGIN - -+void snmpDeliverTrap_netsnmp::initialize() -+{ -+ -+ PEG_METHOD_ENTER (TRC_IND_HANDLER, -+ "snmpDeliverTrap_netsnmp::initialize"); -+ -+ // Defined default MIB modules (in net-snmp-config.h) do not need to be -+ // loaded and loading them can cause some stderr; -+ // use environment variable MIBS to override the default MIB modules. -+ // If there is no MIBS environment variable, add it in. -+ char *envVar; -+ envVar = getenv("MIBS"); -+ -+ if (envVar == NULL) -+ { -+ putenv("MIBS="); -+ } -+ -+ // Initialize the mib reader -+ netsnmp_set_mib_directory(""); -+ init_mib(); -+ -+ // Initializes the SNMP library -+ init_snmp("snmpIndicationHandler"); -+ -+ // windows32 specific initialization (is a NOOP on unix) -+ SOCK_STARTUP; -+ -+ PEG_METHOD_EXIT (); -+ -+} -+ -+void snmpDeliverTrap_netsnmp::terminate() -+{ -+ -+ PEG_METHOD_ENTER (TRC_IND_HANDLER, -+ "snmpDeliverTrap_netsnmp::terminate"); -+ -+ SOCK_CLEANUP; -+ -+ PEG_METHOD_EXIT (); -+} -+ - void snmpDeliverTrap_netsnmp::deliverTrap( - const String& trapOid, - const String& securityName, -@@ -59,12 +102,12 @@ - "snmpDeliverTrap_netsnmp::deliverTrap"); - - void *sessionHandle; -- struct snmp_session snmpSession, *sessionPtr; -+ struct snmp_session *sessionPtr; - - struct snmp_pdu *snmpPdu; - - // Creates a SNMP session -- _createSession(targetHost, portNumber, securityName, snmpSession, -+ _createSession(targetHost, portNumber, securityName, - sessionHandle, sessionPtr); - - try -@@ -138,7 +181,6 @@ - const String & targetHost, - Uint32 portNumber, - const String & securityName, -- snmp_session & snmpSession, - void *&sessionHandle, - snmp_session *&sessionPtr) - { -@@ -148,34 +190,13 @@ - Sint32 libErr, sysErr; - char *errStr; - String exceptionStr; -+ -+ struct snmp_session snmpSession; - -- // Defined default MIB modules (in net-snmp-config.h) do not need to be -- // loaded and loading them can cause some stderr; -- // use environment variable MIBS to override the default MIB modules. -- // If there is no MIBS environment variable, add it in. -- -- char *envVar; -- envVar = getenv("MIBS"); -- -- if (envVar == NULL) - { -- putenv("MIBS="); -- } -- -- // Initialize the mib reader -- netsnmp_set_mib_directory(""); -- init_mib(); -- -- // Initializes the SNMP library -- init_snmp("snmpIndicationHandler"); -- -- // Prepares a struct snmp_session that will be used for a set of -- // SNMP transactions -+ AutoMutex autoMut(_sessionInitMutex); - snmp_sess_init(&snmpSession); - -- // windows32 specific initialization (is a NOOP on unix) -- SOCK_STARTUP; -- - CString targetHostCStr = targetHost.getCString(); - - // peername has format: targetHost:portNumber -@@ -183,7 +204,9 @@ - 1+32)); - sprintf(snmpSession.peername, "%s:%u", (const char*)targetHostCStr, - portNumber); -+ - sessionHandle = snmp_sess_open(&snmpSession); -+ } - - if (sessionHandle == NULL) - { -@@ -196,8 +219,6 @@ - - free(errStr); - -- SOCK_CLEANUP; -- - PEG_METHOD_EXIT (); - - throw PEGASUS_CIM_EXCEPTION_L (CIM_ERR_FAILED, -@@ -276,8 +297,6 @@ - - snmp_sess_close(sessionHandle); - -- SOCK_CLEANUP; -- - PEG_METHOD_EXIT (); - } - ---- pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpIndicationHandler.h.obz4978 2006-01-30 11:17:54.000000000 -0500 -+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpIndicationHandler.h 2006-05-02 15:23:37.000000000 -0400 -@@ -50,19 +50,13 @@ - - CIMRepository* _repository; - -- snmpIndicationHandler() -- { -- } -- -- virtual ~snmpIndicationHandler() -- { -- } -+ snmpIndicationHandler(); -+ -+ virtual ~snmpIndicationHandler(); - - void initialize(CIMRepository* repository); - -- void terminate() -- { -- } -+ void terminate(); - - void handleIndication( - const OperationContext& context, -@@ -71,6 +65,7 @@ - CIMInstance& handler, - CIMInstance& subscription, - ContentLanguageList& contentLanguages); -+ - }; - - PEGASUS_NAMESPACE_END ---- pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.h.obz4978 2006-01-30 11:17:54.000000000 -0500 -+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/snmpDeliverTrap_netsnmp.h 2006-05-02 15:23:37.000000000 -0400 -@@ -37,6 +37,7 @@ - - #include - -+#include - #include - #include - #include "snmpDeliverTrap.h" -@@ -120,6 +121,10 @@ - { - public: - -+ void initialize(); -+ -+ void terminate(); -+ - void deliverTrap( - const String& trapOid, - const String& securityName, -@@ -135,6 +140,10 @@ - - private: - -+ // Mutex is needed before a session is created. Sessions created -+ // using the Single API do not interact with other SNMP sessions. -+ Mutex _sessionInitMutex; -+ - /** - Creates a SNMP session. - -@@ -143,7 +152,6 @@ - to receive a trap - @param portNumber the port number to receive a trap - @param securityName the human readable community name -- @param snmpSession the SNMP session - @param sessionHandle an opaque pointer of the SNMP session - @param sessionPtr the SNMP session pointer to its associated - struct snmp_session -@@ -153,7 +161,6 @@ - void _createSession(const String & targetHost, - Uint32 portNumber, - const String & securityName, -- struct snmp_session & snmpSession, - void *&sessionHandle, - struct snmp_session *&sessionPtr); - diff --git a/pegasus-2.5.1-obz4983.patch b/pegasus-2.5.1-obz4983.patch deleted file mode 100644 index 70cbabb..0000000 --- a/pegasus-2.5.1-obz4983.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- pegasus/src/Pegasus/ProviderManager2/ProviderAgent/ProviderAgent.cpp.obz4983 2006-02-28 14:53:31.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/ProviderAgent/ProviderAgent.cpp 2006-05-02 15:30:34.000000000 -0400 -@@ -589,6 +589,7 @@ - - // Send request back to the server to process - _providerAgent->_writeResponse(message); -+ delete message; - - PEG_METHOD_EXIT(); - } -@@ -601,6 +602,7 @@ - - // Send request back to the server to process - _providerAgent->_writeResponse(response); -+ delete response; - - PEG_METHOD_EXIT(); - } diff --git a/pegasus-2.5.1-obz4984.patch b/pegasus-2.5.1-obz4984.patch deleted file mode 100644 index e275795..0000000 --- a/pegasus-2.5.1-obz4984.patch +++ /dev/null @@ -1,269 +0,0 @@ ---- pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.cpp.obz4980 2006-03-15 16:28:36.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.cpp 2006-05-02 15:34:36.000000000 -0400 -@@ -523,6 +523,28 @@ - //Out of provider support for OS400 goes here when needed. - - #else -+ -+# ifndef PEGASUS_DISABLE_PROV_USERCTXT -+ // Get and save the effective user name and the uid/gid for the user -+ // context of the agent process -+ -+ String effectiveUserName = System::getEffectiveUserName(); -+ PEGASUS_UID_T newUid = (PEGASUS_UID_T) -1; -+ PEGASUS_GID_T newGid = (PEGASUS_GID_T) -1; -+ if (_userName != effectiveUserName) -+ { -+ if (!System::lookupUserId(_userName.getCString(), newUid, newGid)) -+ { -+ throw PEGASUS_CIM_EXCEPTION_L( -+ CIM_ERR_FAILED, -+ MessageLoaderParms( -+ "ProviderManager.OOPProviderManagerRouter." -+ "USER_CONTEXT_CHANGE_FAILED", -+ "Unable to change user context to \"$0\".", _userName)); -+ } -+ } -+# endif -+ - pid_t pid = fork(); - if (pid < 0) - { -@@ -558,11 +580,11 @@ - pipeToAgent->exportReadHandle(readHandle); - pipeFromAgent->exportWriteHandle(writeHandle); - --#ifndef PEGASUS_DISABLE_PROV_USERCTXT -+# ifndef PEGASUS_DISABLE_PROV_USERCTXT - // Set the user context of the Provider Agent process -- if (_userName != System::getEffectiveUserName()) -+ if (_userName != effectiveUserName) - { -- if (!System::changeUserContext(_userName.getCString())) -+ if (!System::changeUserContext(newUid, newGid)) - { - Tracer::trace(TRC_DISCARDED_DATA, Tracer::LEVEL2, - "System::changeUserContext() failed. userName = %s.", -@@ -575,7 +597,7 @@ - _exit(1); - } - } --#endif -+# endif - - execl(agentCommandPathCString, agentCommandPathCString, - readHandle, writeHandle, -@@ -1667,7 +1689,7 @@ - request->operationContext.get(IdentityContainer::NAME); - userName = ic.getUserName(); - } -- catch (Exception& e) -+ catch (Exception&) - { - // If no IdentityContainer is present, default to the CIM - // Server's user context ---- pegasus/src/Pegasus/Common/SystemVms.cpp.obz4980 2006-01-30 11:17:08.000000000 -0500 -+++ pegasus/src/Pegasus/Common/SystemVms.cpp 2006-05-02 15:34:36.000000000 -0400 -@@ -674,7 +674,10 @@ - - #endif - --Boolean System::changeUserContext(const char *userName) -+Boolean System::lookupUserId( -+ const char* userName, -+ PEGASUS_UID_T& uid, -+ PEGASUS_GID_T& gid) - { - const unsigned int PWD_BUFF_SIZE = 1024; - struct passwd pwd; -@@ -697,18 +700,28 @@ - return false; - } - -+ uid = pwd.pw_uid; -+ gid = pwd.pw_gid; -+ -+ return true; -+} -+ -+Boolean System::changeUserContext( -+ const PEGASUS_UID_T& uid, -+ const PEGASUS_GID_T& gid) -+{ - Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL4, - "Changing user context to: uid = %d, gid = %d", -- (int) pwd.pw_uid, (int) pwd.pw_gid); -+ (int) uid, (int) gid); - -- if (setgid(pwd.pw_gid) != 0) -+ if (setgid(gid) != 0) - { - PEG_TRACE_STRING(TRC_OS_ABSTRACTION, Tracer::LEVEL2, - String("setgid failed: ") + String(strerror(errno))); - return false; - } - -- if (setuid(pwd.pw_uid) != 0) -+ if (setuid(uid) != 0) - { - PEG_TRACE_STRING(TRC_OS_ABSTRACTION, Tracer::LEVEL2, - String("setuid failed: ") + String(strerror(errno))); ---- pegasus/src/Pegasus/Common/SystemWindows.cpp.obz4980 2006-02-08 15:50:59.000000000 -0500 -+++ pegasus/src/Pegasus/Common/SystemWindows.cpp 2006-05-02 15:34:36.000000000 -0400 -@@ -838,7 +838,18 @@ - return retVal; - } - --Boolean System::changeUserContext(const char* userName) -+Boolean System::lookupUserId( -+ const char* userName, -+ PEGASUS_UID_T& uid, -+ PEGASUS_GID_T& gid) -+{ -+ // ATTN: Implement this method to look up the specified user -+ return false; -+} -+ -+Boolean System::changeUserContext( -+ const PEGASUS_UID_T& uid, -+ const PEGASUS_GID_T& gid) - { - // ATTN: Implement this method to change the process user context to the - // specified user ---- pegasus/src/Pegasus/Common/SystemNsk.cpp.obz4980 2006-01-30 11:17:08.000000000 -0500 -+++ pegasus/src/Pegasus/Common/SystemNsk.cpp 2006-05-02 15:34:36.000000000 -0400 -@@ -157,7 +157,18 @@ - return true; - } - --Boolean System::changeUserContext(const char* userName) -+Boolean System::lookupUserId( -+ const char* userName, -+ PEGASUS_UID_T& uid, -+ PEGASUS_GID_T& gid) -+{ -+ // ATTN: Implement this method to look up the specified user -+ return false; -+} -+ -+Boolean System::changeUserContext( -+ const PEGASUS_UID_T& uid, -+ const PEGASUS_GID_T& gid) - { - // ATTN: Implement this method to change the process user context to the - // specified user ---- pegasus/src/Pegasus/Common/SystemUnix.cpp.obz4980 2006-01-30 11:17:08.000000000 -0500 -+++ pegasus/src/Pegasus/Common/SystemUnix.cpp 2006-05-02 15:34:36.000000000 -0400 -@@ -1097,8 +1097,12 @@ - - return retVal; - } -+ - #ifndef PEGASUS_OS_OS400 --Boolean System::changeUserContext(const char* userName) -+Boolean System::lookupUserId( -+ const char* userName, -+ PEGASUS_UID_T& uid, -+ PEGASUS_GID_T& gid) - { - const unsigned int PWD_BUFF_SIZE = 1024; - struct passwd pwd; -@@ -1129,18 +1133,28 @@ - return false; - } - -+ uid = pwd.pw_uid; -+ gid = pwd.pw_gid; -+ -+ return true; -+} -+ -+Boolean System::changeUserContext( -+ const PEGASUS_UID_T& uid, -+ const PEGASUS_GID_T& gid) -+{ - Tracer::trace(TRC_OS_ABSTRACTION, Tracer::LEVEL4, - "Changing user context to: uid = %d, gid = %d", -- (int)pwd.pw_uid, (int)pwd.pw_gid); -+ (int)uid, (int)gid); - -- if (setgid(pwd.pw_gid) != 0) -+ if (setgid(gid) != 0) - { - PEG_TRACE_STRING(TRC_OS_ABSTRACTION, Tracer::LEVEL2, - String("setgid failed: ") + String(strerror(errno))); - return false; - } - -- if (setuid(pwd.pw_uid) != 0) -+ if (setuid(uid) != 0) - { - PEG_TRACE_STRING(TRC_OS_ABSTRACTION, Tracer::LEVEL2, - String("setuid failed: ") + String(strerror(errno))); -@@ -1150,6 +1164,7 @@ - return true; - } - #endif -+ - Uint32 System::getPID() - { - // ---- pegasus/src/Pegasus/Common/System.h.obz4980 2006-01-30 11:17:08.000000000 -0500 -+++ pegasus/src/Pegasus/Common/System.h 2006-05-02 15:34:36.000000000 -0400 -@@ -57,6 +57,16 @@ - #endif - #endif - -+#ifdef PEGASUS_OS_TYPE_UNIX -+# ifndef PEGASUS_OS_OS400 -+# include -+# endif -+# define PEGASUS_UID_T uid_t -+# define PEGASUS_GID_T gid_t -+#else -+# define PEGASUS_UID_T Uint32 -+# define PEGASUS_GID_T Uint32 -+#endif - - // - // Protocal Type -@@ -246,16 +256,33 @@ - static Boolean isGroupMember(const char* userName, const char* groupName); - - /** -- Changes the process user context to the specified user. -- -- @param userName User name to set as the process user context. -+ Gets the user and group IDs associated with the specified user. -+ @param userName User name for which to look up user and group IDs. -+ @param uid User ID for the specified user name. -+ @param gid Group ID for the specified user name. -+ @return True if the user and group IDs were retrieved -+ successfully, false otherwise. -+ */ -+#ifndef PEGASUS_OS_OS400 -+ static Boolean lookupUserId( -+ const char* userName, -+ PEGASUS_UID_T& uid, -+ PEGASUS_GID_T& gid); -+#endif - -- @return True if the user context is successfully changed, -- false otherwise. -+ /** -+ Changes the process user context to the specified user and group ID. -+ @param uid User ID to set as the process user context. -+ @param gid Group ID to set as the process group context. -+ @return True if the user context is successfully changed, -+ false otherwise. - */ - #ifndef PEGASUS_OS_OS400 -- static Boolean changeUserContext(const char* userName); -+ static Boolean changeUserContext( -+ const PEGASUS_UID_T& uid, -+ const PEGASUS_GID_T& gid); - #endif -+ - /** - This function is used to get the process ID of the calling process. - diff --git a/pegasus-2.5.1-obz4986.patch b/pegasus-2.5.1-obz4986.patch deleted file mode 100644 index b6eb27f..0000000 --- a/pegasus-2.5.1-obz4986.patch +++ /dev/null @@ -1,1032 +0,0 @@ -diff -Nur pegasus.orig/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/Makefile pegasus/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/Makefile ---- pegasus.orig/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/Makefile 2006-05-02 15:45:49.000000000 -0400 -@@ -0,0 +1,63 @@ -+#//%2006//////////////////////////////////////////////////////////////////////// -+#// -+#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development -+#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. -+#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; -+#// IBM Corp.; EMC Corporation, The Open Group. -+#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; -+#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. -+#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+#// EMC Corporation; VERITAS Software Corporation; The Open Group. -+#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+#// EMC Corporation; Symantec 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"), to -+#// deal in the Software without restriction, including without limitation the -+#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+#// sell copies of the Software, and to permit persons to whom the Software is -+#// furnished to do so, subject to the following conditions: -+#// -+#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN -+#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED -+#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -+#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+#// 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. -+#// -+#//============================================================================== -+ -+ROOT = ../../../../../.. -+DIR = Pegasus/Handler/snmpIndicationHandler/tests/testclient -+include $(ROOT)/mak/config.mak -+ -+LIBRARIES = \ -+ pegclient \ -+ pegcommon -+ -+EXTRA_INCLUDES = $(SYS_INCLUDES) -+ -+LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -+ -+PROGRAM = TestSnmpHandler -+ -+SOURCES = testSnmpHandler.cpp -+ -+include $(ROOT)/mak/program.mak -+ -+tests: -+ -+poststarttests: -+ifdef PEGASUS_USE_NET_SNMP -+ $(MAKE) wql_4_2 -+else -+ @ $(ECHO) +++++ PEGASUS_USE_NET_SNMP is not set, test can not be run -+endif -+ -+wql_4_2: -+ $(PROGRAM) setup WQL -+ $(PROGRAM) run 4 2 -+ $(PROGRAM) cleanup -+ $(PROGRAM) removelog -diff -Nur pegasus.orig/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/testSnmpHandler.cpp pegasus/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/testSnmpHandler.cpp ---- pegasus.orig/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/testSnmpHandler.cpp 1969-12-31 19:00:00.000000000 -0500 -+++ pegasus/src/Pegasus/Handler/snmpIndicationHandler/tests/testclient/testSnmpHandler.cpp 2006-05-02 15:46:12.000000000 -0400 -@@ -0,0 +1,961 @@ -+//%2006//////////////////////////////////////////////////////////////////////// -+// -+// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development -+// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. -+// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; -+// IBM Corp.; EMC Corporation, The Open Group. -+// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; -+// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. -+// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+// EMC Corporation; VERITAS Software Corporation; The Open Group. -+// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+// EMC Corporation; Symantec 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"), to -+// deal in the Software without restriction, including without limitation the -+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+// sell copies of the Software, and to permit persons to whom the Software is -+// furnished to do so, subject to the following conditions: -+// -+// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN -+// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED -+// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -+// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+// 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. -+// -+//============================================================================== -+// -+// Author: Yi Zhou, Hewlett-Packard Company (Yi.Zhou@hp.com) -+// -+// Modified By: -+// -+//%///////////////////////////////////////////////////////////////////////////// -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+PEGASUS_USING_PEGASUS; -+PEGASUS_USING_STD; -+ -+const CIMNamespaceName INTEROP_NAMESPACE = CIMNamespaceName ("root/PG_InterOp"); -+const CIMNamespaceName SOURCE_NAMESPACE = -+ CIMNamespaceName ("root/SampleProvider"); -+ -+const String INDICATION_CLASS_NAME = String ("RT_TestIndication"); -+ -+const String SNMPV1_HANDLER_NAME = String ("SNMPHandler01"); -+const String SNMPV2C_HANDLER_NAME = String ("SNMPHandler02"); -+const String FILTER_NAME = String ("IPFilter01"); -+ -+enum SNMPVersion {_SNMPV1_TRAP = 2, _SNMPV2C_TRAP = 3}; -+enum TargetHostFormat {_HOST_NAME = 2, _IPV4_ADDRESS = 3}; -+ -+#define PORT_NUMBER 2006 -+ -+Uint32 indicationSendCountTotal = 0; -+ -+AtomicInt errorsEncountered(0); -+ -+//////////////////////////////////////////////////////////////////////////////// -+// -+// Thread Parameters Class -+// -+//////////////////////////////////////////////////////////////////////////////// -+ -+class T_Parms{ -+ public: -+ AutoPtr client; -+ Uint32 indicationSendCount; -+ Uint32 uniqueID; -+}; -+ -+/////////////////////////////////////////////////////////////////////////// -+ -+CIMObjectPath _getFilterObjectPath -+ (const String & name) -+{ -+ Array keyBindings; -+ keyBindings.append (CIMKeyBinding ("SystemCreationClassName", -+ System::getSystemCreationClassName (), CIMKeyBinding::STRING)); -+ keyBindings.append (CIMKeyBinding ("SystemName", -+ System::getFullyQualifiedHostName (), CIMKeyBinding::STRING)); -+ keyBindings.append (CIMKeyBinding ("CreationClassName", -+ PEGASUS_CLASSNAME_INDFILTER.getString(), CIMKeyBinding::STRING)); -+ keyBindings.append (CIMKeyBinding ("Name", name, -+ CIMKeyBinding::STRING)); -+ return(CIMObjectPath("", CIMNamespaceName (), -+ PEGASUS_CLASSNAME_INDFILTER, keyBindings)); -+} -+ -+CIMObjectPath _getHandlerObjectPath -+ (const String & name) -+{ -+ Array keyBindings; -+ keyBindings.append (CIMKeyBinding ("SystemCreationClassName", -+ System::getSystemCreationClassName (), CIMKeyBinding::STRING)); -+ keyBindings.append (CIMKeyBinding ("SystemName", -+ System::getFullyQualifiedHostName (), CIMKeyBinding::STRING)); -+ keyBindings.append (CIMKeyBinding ("CreationClassName", -+ PEGASUS_CLASSNAME_INDHANDLER_SNMP.getString(), -+ CIMKeyBinding::STRING)); -+ keyBindings.append (CIMKeyBinding ("Name", name, -+ CIMKeyBinding::STRING)); -+ return(CIMObjectPath("", CIMNamespaceName (), -+ PEGASUS_CLASSNAME_INDHANDLER_SNMP, keyBindings)); -+} -+ -+CIMObjectPath _getSubscriptionObjectPath -+ (const String & filterName, -+ const String & handlerName) -+{ -+ CIMObjectPath filterObjectPath = _getFilterObjectPath(filterName); -+ -+ CIMObjectPath handlerObjectPath = _getHandlerObjectPath(handlerName); -+ -+ Array subscriptionKeyBindings; -+ subscriptionKeyBindings.append (CIMKeyBinding ("Filter", -+ CIMValue(filterObjectPath))); -+ subscriptionKeyBindings.append (CIMKeyBinding ("Handler", -+ CIMValue(handlerObjectPath))); -+ return(CIMObjectPath("", CIMNamespaceName (), -+ PEGASUS_CLASSNAME_INDSUBSCRIPTION, subscriptionKeyBindings)); -+} -+ -+CIMObjectPath _createHandlerInstance -+ (CIMClient & client, -+ const String & name, -+ const String & targetHost, -+ const String & securityName, -+ const Uint16 targetHostFormat, -+ const Uint16 snmpVersion) -+{ -+ CIMInstance handlerInstance (PEGASUS_CLASSNAME_INDHANDLER_SNMP); -+ handlerInstance.addProperty (CIMProperty (CIMName -+ ("SystemCreationClassName"), System::getSystemCreationClassName ())); -+ handlerInstance.addProperty (CIMProperty (CIMName ("SystemName"), -+ System::getFullyQualifiedHostName ())); -+ handlerInstance.addProperty (CIMProperty (CIMName ("CreationClassName"), -+ PEGASUS_CLASSNAME_INDHANDLER_SNMP.getString ())); -+ handlerInstance.addProperty (CIMProperty (CIMName ("Name"), name)); -+ handlerInstance.addProperty (CIMProperty (CIMName ("TargetHost"), -+ targetHost)); -+ handlerInstance.addProperty (CIMProperty (CIMName ("TargetHostFormat"), -+ CIMValue ((Uint16) targetHostFormat))); -+ handlerInstance.addProperty (CIMProperty (CIMName ("SNMPSecurityName"), -+ securityName)); -+ handlerInstance.addProperty (CIMProperty (CIMName ("SnmpVersion"), -+ CIMValue ((Uint16) snmpVersion))); -+ handlerInstance.addProperty (CIMProperty (CIMName ("PortNumber"), -+ CIMValue ((Uint32) PORT_NUMBER))); -+ -+ return(client.createInstance (INTEROP_NAMESPACE, handlerInstance)); -+} -+ -+CIMObjectPath _createFilterInstance -+ (CIMClient & client, -+ const String & name, -+ const String & query, -+ const String & qlang) -+{ -+ CIMInstance filterInstance (PEGASUS_CLASSNAME_INDFILTER); -+ filterInstance.addProperty (CIMProperty (CIMName -+ ("SystemCreationClassName"), System::getSystemCreationClassName ())); -+ filterInstance.addProperty (CIMProperty (CIMName ("SystemName"), -+ System::getFullyQualifiedHostName ())); -+ filterInstance.addProperty (CIMProperty (CIMName ("CreationClassName"), -+ PEGASUS_CLASSNAME_INDFILTER.getString ())); -+ filterInstance.addProperty (CIMProperty (CIMName ("Name"), name)); -+ filterInstance.addProperty (CIMProperty (CIMName ("Query"), query)); -+ filterInstance.addProperty (CIMProperty (CIMName ("QueryLanguage"), -+ String (qlang))); -+ filterInstance.addProperty (CIMProperty (CIMName ("SourceNamespace"), -+ SOURCE_NAMESPACE.getString ())); -+ -+ return(client.createInstance (INTEROP_NAMESPACE, filterInstance)); -+} -+ -+CIMObjectPath _createSubscriptionInstance -+ (CIMClient & client, -+ const CIMObjectPath & filterPath, -+ const CIMObjectPath & handlerPath) -+{ -+ CIMInstance subscriptionInstance (PEGASUS_CLASSNAME_INDSUBSCRIPTION); -+ subscriptionInstance.addProperty (CIMProperty (CIMName ("Filter"), -+ filterPath, 0, PEGASUS_CLASSNAME_INDFILTER)); -+ subscriptionInstance.addProperty (CIMProperty (CIMName ("Handler"), -+ handlerPath, 0, PEGASUS_CLASSNAME_INDHANDLER_SNMP)); -+ subscriptionInstance.addProperty (CIMProperty -+ (CIMName ("SubscriptionState"), CIMValue ((Uint16) 2))); -+ -+ return(client.createInstance (INTEROP_NAMESPACE, subscriptionInstance)); -+} -+ -+void _sendTestIndication(CIMClient* client, const CIMName & methodName, -+ Uint32 indicationSendCount) -+{ -+ // -+ // Invoke method to send test indication -+ // -+ Array inParams; -+ Array outParams; -+ Array keyBindings; -+ Sint32 result; -+ -+ CIMObjectPath className (String::EMPTY, CIMNamespaceName (), -+ CIMName ("RT_TestIndication"), keyBindings); -+ -+ inParams.append(CIMParamValue(String("indicationSendCount"), -+ CIMValue(indicationSendCount))); -+ -+ CIMValue retValue = client->invokeMethod -+ (SOURCE_NAMESPACE, -+ className, -+ methodName, -+ inParams, -+ outParams); -+ -+ retValue.get (result); -+ PEGASUS_TEST_ASSERT (result == 0); -+} -+ -+void _deleteSubscriptionInstance -+ (CIMClient & client, -+ const String & filterName, -+ const String & handlerName) -+{ -+ CIMObjectPath subscriptionObjectPath = -+ _getSubscriptionObjectPath(filterName, handlerName); -+ client.deleteInstance (INTEROP_NAMESPACE, subscriptionObjectPath); -+} -+ -+void _deleteHandlerInstance -+ (CIMClient & client, -+ const String & name) -+{ -+ CIMObjectPath handlerObjectPath = _getHandlerObjectPath(name); -+ client.deleteInstance (INTEROP_NAMESPACE, handlerObjectPath); -+} -+ -+void _deleteFilterInstance -+ (CIMClient & client, -+ const String & name) -+{ -+ CIMObjectPath filterObjectPath = _getFilterObjectPath(name); -+ client.deleteInstance (INTEROP_NAMESPACE, filterObjectPath); -+} -+ -+void _usage () -+{ -+ cerr << endl -+ << "Usage:" << endl -+ << " TestSnmpHandler setup [ WQL | DMTF:CQL ]\n" -+ << " TestSnmpHandler run " -+ << "[]\n" -+ << " where: " << endl -+ << " is the number of indications to\n" -+ << " generate and has to be greater than zero." << endl -+ << " is an optional number of client threads to\n" -+ << " create, default is one." << endl -+ << " TestSnmpHandler cleanup\n" -+ << " TestSnmpHandler removelog" -+ << endl << endl; -+} -+ -+void _setup (CIMClient & client, const String& qlang) -+{ -+ CIMObjectPath filterObjectPath; -+ CIMObjectPath snmpv1HandlerObjectPath; -+ CIMObjectPath snmpv2HandlerObjectPath; -+ -+ try -+ { -+ filterObjectPath = _createFilterInstance (client, FILTER_NAME, -+ String ("SELECT * FROM RT_TestIndication"), -+ qlang); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() == CIM_ERR_ALREADY_EXISTS) -+ { -+ filterObjectPath = _getFilterObjectPath(FILTER_NAME); -+ cerr << "----- Warning: Filter Instance Not Created: " -+ << e.getMessage () << endl; -+ } -+ else -+ { -+ cerr << "----- Error: Filter Instance Not Created: " << endl; -+ throw; -+ } -+ } -+ -+ try -+ { -+ // Create SNMPv1 trap handler -+ snmpv1HandlerObjectPath = _createHandlerInstance (client, -+ SNMPV1_HANDLER_NAME, -+ System::getFullyQualifiedHostName(), -+ "", -+ _HOST_NAME, -+ _SNMPV1_TRAP); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() == CIM_ERR_ALREADY_EXISTS) -+ { -+ snmpv1HandlerObjectPath = _getHandlerObjectPath( -+ SNMPV1_HANDLER_NAME); -+ cerr << "----- Warning: SNMPv1 Trap Handler Instance Not Created: " -+ << e.getMessage () << endl; -+ } -+ else -+ { -+ cerr << "----- Error: SNMPv1 Trap Handler Instance Not Created: " -+ << endl; -+ throw; -+ } -+ } -+ -+ try -+ { -+ _createSubscriptionInstance (client, filterObjectPath, -+ snmpv1HandlerObjectPath); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() == CIM_ERR_ALREADY_EXISTS) -+ { -+ cerr << "----- Warning: Client Subscription Instance: " -+ << e.getMessage () << endl; -+ } -+ else -+ { -+ cerr << "----- Error: Client Subscription Instance: " << endl; -+ throw; -+ } -+ } -+ -+ try -+ { -+ // Create SNMPv2 trap handler -+ snmpv2HandlerObjectPath = _createHandlerInstance (client, -+ SNMPV2C_HANDLER_NAME, -+ System::getHostIP(System::getFullyQualifiedHostName ()), -+ "public", -+ _IPV4_ADDRESS, -+ _SNMPV2C_TRAP); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() == CIM_ERR_ALREADY_EXISTS) -+ { -+ snmpv2HandlerObjectPath = _getHandlerObjectPath( -+ SNMPV2C_HANDLER_NAME); -+ cerr << "----- Warning: SNMPv2c Trap Handler Instance Not Created: " -+ << e.getMessage () << endl; -+ } -+ else -+ { -+ cerr << "----- Error: SNMPv2c Trap Handler Instance Not Created: " -+ << endl; -+ throw; -+ } -+ } -+ -+ try -+ { -+ _createSubscriptionInstance (client, filterObjectPath, -+ snmpv2HandlerObjectPath); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() == CIM_ERR_ALREADY_EXISTS) -+ { -+ cerr << "----- Warning: Client Subscription Instance: " -+ << e.getMessage () << endl; -+ } -+ else -+ { -+ cerr << "----- Error: Client Subscription Instance: " << endl; -+ throw; -+ } -+ } -+} -+ -+void _cleanup (CIMClient & client) -+{ -+ try -+ { -+ _deleteSubscriptionInstance (client, FILTER_NAME, -+ SNMPV1_HANDLER_NAME); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() != CIM_ERR_NOT_FOUND) -+ { -+ cerr << "----- Error: deleteSubscriptionInstance failure: " -+ << endl; -+ throw; -+ } -+ } -+ try -+ { -+ _deleteSubscriptionInstance (client, FILTER_NAME, -+ SNMPV2C_HANDLER_NAME); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() != CIM_ERR_NOT_FOUND) -+ { -+ cerr << "----- Error: deleteSubscriptionInstance failure: " -+ << endl; -+ throw; -+ } -+ } -+ try -+ { -+ _deleteFilterInstance (client, FILTER_NAME); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() != CIM_ERR_NOT_FOUND) -+ { -+ cerr << "----- Error: deleteFilterInstance failure: " << endl; -+ throw; -+ } -+ } -+ -+ try -+ { -+ _deleteHandlerInstance (client, SNMPV1_HANDLER_NAME); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() != CIM_ERR_NOT_FOUND) -+ { -+ cerr << "----- Error: deleteHandlerInstance failure: " << endl; -+ throw; -+ } -+ } -+ try -+ { -+ _deleteHandlerInstance (client, SNMPV2C_HANDLER_NAME); -+ } -+ catch (CIMException& e) -+ { -+ if (e.getCode() != CIM_ERR_NOT_FOUND) -+ { -+ cerr << "----- Error: deleteHandlerInstance failure: " << endl; -+ throw; -+ } -+ } -+} -+ -+static void _testEnd(const String& uniqueID, const double elapsedTime) -+{ -+ cout << "+++++ thread" << uniqueID << ": passed in " << elapsedTime -+ << " seconds" << endl; -+} -+ -+PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL _executeTests(void *parm) -+{ -+ Thread *my_thread = (Thread *)parm; -+ T_Parms *parms = (T_Parms *)my_thread->get_parm(); -+ CIMClient *client = parms->client.get(); -+ Uint32 indicationSendCount = parms->indicationSendCount; -+ Uint32 id = parms->uniqueID; -+ char id_[4]; -+ memset(id_,0x00,sizeof(id_)); -+ sprintf(id_,"%i",id); -+ String uniqueID = "_"; -+ uniqueID.append(id_); -+ -+ try -+ { -+ Stopwatch elapsedTime; -+ -+ elapsedTime.start(); -+ try -+ { -+ _sendTestIndication (client, CIMName ("SendTestIndicationTrap"), -+ indicationSendCount); -+ } -+ catch (Exception & e) -+ { -+ cerr << "----- sendTestIndication failed: " << e.getMessage () << endl; -+ exit (-1); -+ } -+ elapsedTime.stop(); -+ _testEnd(uniqueID, elapsedTime.getElapsed()); -+ } -+ catch(Exception & e) -+ { -+ cout << e.getMessage() << endl; -+ } -+ my_thread->exit_self((PEGASUS_THREAD_RETURN)1); -+ return(0); -+} -+ -+Thread * _runTestThreads( -+ CIMClient* client, -+ Uint32 indicationSendCount, -+ Uint32 uniqueID) -+{ -+ // package parameters, create thread and run... -+ AutoPtr parms(new T_Parms()); -+ parms->client.reset(client); -+ parms->indicationSendCount = indicationSendCount; -+ parms->uniqueID = uniqueID; -+ AutoPtr t(new Thread(_executeTests, (void*)parms.release(), false)); -+ t->run(); -+ return t.release(); -+} -+ -+String _getLogFile() -+{ -+ return("trapLogFile"); -+} -+ -+Uint32 _getReceivedTrapCount(Uint16 snmpVersion) -+{ -+ String trap1 = "Trap Info: TRAP, SNMP v1, community public"; -+ String trap2 = "Trap Info: TRAP2, SNMP v2c, community public"; -+ -+ Uint32 receivedTrap1Count = 0; -+ Uint32 receivedTrap2Count = 0; -+ -+ ifstream ifs(_getLogFile().getCString()); -+ if (!ifs) -+ { -+ return (0); -+ } -+ -+ String line; -+ while (GetLine(ifs, line)) -+ { -+ if (String::compare(line, trap1) == 0) -+ { -+ receivedTrap1Count++; -+ } -+ if (String::compare(line, trap2) == 0) -+ { -+ receivedTrap2Count++; -+ } -+ } -+ -+ ifs.close(); -+ -+ switch (snmpVersion) -+ { -+ case _SNMPV1_TRAP: -+ { -+ return (receivedTrap1Count); -+ } -+ case _SNMPV2C_TRAP: -+ { -+ return (receivedTrap2Count); -+ } -+ default: -+ { -+ return (0); -+ } -+ } -+ -+} -+ -+#ifdef PEGASUS_USE_NET_SNMP -+// Stop snmptrapd process if it is running and remove -+// procIdFile file if it exists -+// -+void _stopSnmptrapd() -+{ -+ String procIdFileName = "procIdFile"; -+ -+ Uint32 receiverPid; -+ FILE *fd; -+ if ((fd = fopen(procIdFileName.getCString(), "r")) != NULL) -+ { -+ fscanf(fd, "%d\n", &receiverPid); -+ -+ kill(receiverPid, SIGTERM); -+ -+ fclose(fd); -+ } -+ -+ if (FileSystem::exists(procIdFileName)) -+ { -+ FileSystem::removeFile(procIdFileName); -+ } -+} -+ -+static Boolean _startSnmptrapd( -+ FILE **trapInfo) -+{ -+ String snmptrapdCmd; -+ -+ Uint32 portNumber = PORT_NUMBER; -+ char portNumberStr[32]; -+ sprintf(portNumberStr, "%lu", (unsigned long) portNumber); -+ -+ // -+ // build snmptrapd cmd options -+ // -+ -+ // Specify logging incoming traps to trapLogFile -+ // Save the process ID of the snmptrapd in procIdFile -+ snmptrapdCmd.append( -+ "/usr/sbin/snmptrapd -f -Lf trapLogFile -p procIdFile"); -+ -+ // Specify incoming trap format -+ snmptrapdCmd.append( " -F \"\nTrap Info: %P\nVariable: %v\n\""); -+ -+ // Specify listening address -+ snmptrapdCmd.append(" UDP:"); -+ snmptrapdCmd.append(System::getFullyQualifiedHostName ()); -+ -+ snmptrapdCmd.append(":"); -+ snmptrapdCmd.append(portNumberStr); -+ -+ if ((*trapInfo = popen(snmptrapdCmd.getCString(), "r")) == NULL) -+ { -+ throw Exception ("snmptrapd can not be started"); -+ } -+ -+#define MAX_ITERATIONS 300 -+#define SLEEP_SEC 1 -+ -+ Uint32 iterations = 0; -+ -+ // Wait until snmptrapd startted -+ while (iterations < MAX_ITERATIONS) -+ { -+ iterations++; -+ if (FileSystem::exists("procIdFile")) -+ { -+ return (true); -+ } -+ else -+ { -+ System::sleep(SLEEP_SEC); -+ -+ } -+ } -+ -+ throw Exception ("snmptrapd can not be started"); -+} -+#endif -+ -+void _removeTrapLogFile () -+{ -+ String logFile = _getLogFile(); -+ -+ // if trapLogFile exists, remove it -+ if (FileSystem::exists(logFile)) -+ { -+ FileSystem::removeFile(logFile); -+ } -+} -+ -+int _beginTest(CIMClient& workClient, -+ Uint32 indicationSendCount, -+ Uint32 runClientThreadCount) -+{ -+ -+#ifdef PEGASUS_USE_NET_SNMP -+ -+ // Stop snmptrapd process if it is running -+ _stopSnmptrapd(); -+ -+ // if trapLogFile exists, remove it -+ _removeTrapLogFile(); -+ -+ FILE * trapInfo; -+ -+ try -+ { -+ _startSnmptrapd(&trapInfo); -+ } -+ catch (Exception & e) -+ { -+ cerr << e.getMessage() << endl; -+ return (-1); -+ } -+#else -+ cerr << "Cannot create a trap receiver." << endl; -+ return (-1); -+#endif -+ -+ CIMClient * clientConnections = new CIMClient[runClientThreadCount]; -+ -+ // determine total number of indication send count -+ indicationSendCountTotal = indicationSendCount * runClientThreadCount; -+ -+ // calculate the timeout based on the total send count allowing -+ // using the MSG_PER_SEC rate -+ // allow 20 seconds of test overhead for very small tests -+ -+#define MSG_PER_SEC 4 -+ -+ Uint32 testTimeout = 20000+(indicationSendCountTotal/MSG_PER_SEC)*1000; -+ -+ // connect the clients -+ for(Uint32 i = 0; i < runClientThreadCount; i++) -+ { -+ clientConnections[i].setTimeout(testTimeout); -+ clientConnections[i].connectLocal(); -+ } -+ -+ // run tests -+ Thread ** clientThreads = new Thread *[runClientThreadCount]; -+ -+ Stopwatch trapReceiverElapsedTime; -+ -+ trapReceiverElapsedTime.start(); -+ -+ for(Uint32 i = 0; i < runClientThreadCount; i++) -+ { -+ clientThreads[i] = _runTestThreads(&clientConnections[i], -+ indicationSendCount, i); -+ } -+ -+ for(Uint32 i=0; i< runClientThreadCount; i++) -+ { -+ clientThreads[i]->join(); -+ } -+ -+ delete[] clientConnections; -+ delete[] clientThreads; -+ -+ // -+ // Allow time for the trap to be received -+ // Wait in SLEEP_SEC second intervals. -+ // Put msg out every MSG_SEC intervals -+ // -+ -+#define SLEEP_SEC 1 -+#define COUT_TIME_INTERVAL 30 -+#define MAX_NO_CHANGE_ITERATIONS COUT_TIME_INTERVAL*3 -+ -+ Uint32 noChangeIterations = 0; -+ Uint32 priorReceivedTrap1Count = 0; -+ Uint32 priorReceivedTrap2Count = 0; -+ Uint32 currentReceivedTrap1Count = 0; -+ Uint32 currentReceivedTrap2Count = 0; -+ Uint32 totalIterations = 0; -+ -+ // -+ // Wait for the trap receiver to receive the expected -+ // number of Indication traps, indicationSendCountTotal. -+ // -+ // We will continue to wait until either indicationSendCountTotal -+ // Indications have been received by the trap receiver or no new -+ // Indications have been received in the previous -+ // MAX_NO_CHANGE_ITERATIONS. -+ // iterations. -+ // -+ -+ Boolean receivedTrapCountComplete = false; -+ Boolean receiverTrap1NoChange = true; -+ Boolean receiverTrap2NoChange = true; -+ -+ while (noChangeIterations <= MAX_NO_CHANGE_ITERATIONS) -+ { -+ totalIterations++; -+ -+ currentReceivedTrap1Count = _getReceivedTrapCount(_SNMPV1_TRAP); -+ currentReceivedTrap2Count = _getReceivedTrapCount(_SNMPV2C_TRAP); -+ -+ if (totalIterations % COUT_TIME_INTERVAL == 1 && -+ !(receivedTrapCountComplete)) -+ { -+ cout << "++++ The trap receiver has received " -+ << currentReceivedTrap1Count << " of " -+ << indicationSendCountTotal << " SNMPv1 trap." -+ << endl; -+ cout << "++++ The trap receiver has received " -+ << currentReceivedTrap2Count << " of " -+ << indicationSendCountTotal << " SNMPv2c trap." -+ << endl; -+ } -+ -+ if ((indicationSendCountTotal == currentReceivedTrap1Count) && -+ (indicationSendCountTotal == currentReceivedTrap2Count)) -+ { -+ receivedTrapCountComplete = true; -+ trapReceiverElapsedTime.stop(); -+ } -+ if (!(receiverTrap1NoChange = -+ (priorReceivedTrap1Count == currentReceivedTrap1Count))) -+ { -+ priorReceivedTrap1Count = currentReceivedTrap1Count; -+ } -+ -+ if (!(receiverTrap2NoChange = -+ (priorReceivedTrap2Count == currentReceivedTrap2Count))) -+ { -+ priorReceivedTrap2Count = currentReceivedTrap2Count; -+ } -+ -+ if (receivedTrapCountComplete) -+ { -+ cout << "++++ The trap receiver has received " -+ << currentReceivedTrap1Count << " of " -+ << indicationSendCountTotal << " SNMPv1 trap." -+ << endl; -+ cout << "++++ The trap receiver has received " -+ << currentReceivedTrap2Count << " of " -+ << indicationSendCountTotal << " SNMPv2c trap." -+ << endl; -+ -+ break; -+ } -+ if (receiverTrap1NoChange || receiverTrap2NoChange) -+ { -+ noChangeIterations++; -+ } -+ else -+ { -+ noChangeIterations = 0; -+ } -+ -+ System::sleep (SLEEP_SEC); -+ } -+ -+ if (!receivedTrapCountComplete) -+ { -+ trapReceiverElapsedTime.stop(); -+ } -+ -+ // assert that all indications sent have been received. -+ PEGASUS_TEST_ASSERT(indicationSendCountTotal == -+ currentReceivedTrap1Count); -+ PEGASUS_TEST_ASSERT(indicationSendCountTotal == -+ currentReceivedTrap2Count); -+ -+#ifdef PEGASUS_USE_NET_SNMP -+ // Stop snmptrapd process if it is running and remove procIdFile -+ _stopSnmptrapd(); -+ -+ pclose(trapInfo); -+#endif -+ -+ // if error encountered then fail the test. -+ if (errorsEncountered.get()) -+ { -+ cout << "+++++ test failed" << endl; -+ return (-1); -+ } -+ else -+ { -+ cout << "+++++ passed all tests" << endl; -+ } -+ -+ return 0; -+} -+ -+int main (int argc, char** argv) -+{ -+ // This client connection is used solely to create and delete subscriptions. -+ CIMClient workClient; -+ try -+ { -+ workClient.connectLocal(); -+ -+ if (argc <= 1 || argc > 4) -+ { -+ cerr << "Invalid argument count: " << argc << endl; -+ _usage(); -+ return 1; -+ } -+ else if (strcmp(argv[1], "setup") == 0) -+ { -+ if (argc < 3) -+ { -+ cerr << "Missing query language" << endl; -+ _usage(); -+ return -1; -+ } -+ -+ if ((strcmp(argv[2], "WQL") != 0) && -+ (strcmp(argv[2], "DMTF:CQL") != 0)) -+ { -+ cerr << "Invalid query language: '" << argv[2] << "'" << endl; -+ _usage(); -+ return -1; -+ } -+ -+ _setup(workClient, argv[2]); -+ -+ cout << "+++++ setup completed successfully" << endl; -+ return 0; -+ } -+ else if (String::equalNoCase(argv[1], "run")) -+ { -+ if (argc < 3) -+ { -+ cerr << "Invalid indicationSendCount." << endl; -+ _usage (); -+ return -1; -+ } -+ -+ Uint32 indicationSendCount = atoi(argv[2]); -+ -+ Uint32 runClientThreadCount = 1; -+ -+ if (argc == 4) -+ { -+ runClientThreadCount = atoi(argv[3]); -+ } -+ -+ int rc = _beginTest(workClient, indicationSendCount, -+ runClientThreadCount); -+ return rc; -+ } -+ else if (String::equalNoCase(argv[1], "cleanup")) -+ { -+ if (argc > 2) -+ { -+ cerr << "Invalid argument count." << endl; -+ _usage (); -+ return -1; -+ } -+ -+ _cleanup (workClient); -+ -+ cout << "+++++ cleanup completed successfully" << endl; -+ return 0; -+ } -+ else if (String::equalNoCase(argv[1], "removelog")) -+ { -+ if (argc > 2) -+ { -+ cerr << "Invalid argument count." << endl; -+ _usage (); -+ return -1; -+ } -+ -+ _removeTrapLogFile (); -+ cout << "+++++ removelog completed successfully" << endl; -+ return 0; -+ } -+ else -+ { -+ cerr << "Invalid option: " << argv[1] << endl; -+ _usage (); -+ return -1; -+ } -+ } -+ catch (Exception & e) -+ { -+ cerr << "Error: " << e.getMessage() << endl; -+ } -+ -+ PEGASUS_UNREACHABLE( return 0; ) -+} diff --git a/pegasus-2.5.1-obz5046.patch b/pegasus-2.5.1-obz5046.patch deleted file mode 100644 index 213a2df..0000000 --- a/pegasus-2.5.1-obz5046.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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) diff --git a/pegasus-2.5.1-obz5047.patch b/pegasus-2.5.1-obz5047.patch deleted file mode 100644 index 4549098..0000000 --- a/pegasus-2.5.1-obz5047.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 - #include - -+#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) diff --git a/pegasus-2.5.1-obz5048.patch b/pegasus-2.5.1-obz5048.patch deleted file mode 100644 index 9e39a2c..0000000 --- a/pegasus-2.5.1-obz5048.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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); - } - diff --git a/pegasus-2.5.1-obz5049.patch b/pegasus-2.5.1-obz5049.patch deleted file mode 100644 index 4f868a2..0000000 --- a/pegasus-2.5.1-obz5049.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 - #include - #include --#include - - 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 - #include - #include -+#ifdef PEGASUS_USE_EXPERIMENTAL_INTERFACES - #include -+#endif - #include - #include - ---- 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_NAMESPACE_BEGIN - diff --git a/pegasus-2.5.1-obz5051.patch b/pegasus-2.5.1-obz5051.patch deleted file mode 100644 index 38f75d8..0000000 --- a/pegasus-2.5.1-obz5051.patch +++ /dev/null @@ -1,1664 +0,0 @@ ---- pegasus/TestMakefile.obz5051 2006-02-17 18:46:50.000000000 -0500 -+++ pegasus/TestMakefile 2006-05-31 12:18:40.000000000 -0400 -@@ -257,6 +257,8 @@ - $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestBinRepository - $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOP_TS1 - $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_IndInit_TS1 -+ $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS1 -+ $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_OOPProvFail_TS2 - $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_INDSSL_TS1 - $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_SSL_TS1 - $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile run_G11N_TS1 -@@ -360,6 +362,61 @@ - TESTSUITE_CMDS="$(IndInit_TS1b_TEST_CMDS)" - - ############################################################################### -+## OOPProvFail Test Suite 1: OOP Provider Module Failure Tests -+## -+## Configuration Options: forceProviderProcesses=true -+## enableAuthentication=true, enableAuthentication=false -+## -+## NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test -+## suite is always run with OOP enabled. This test suite causes a provider to -+## exit. Running this test suite with OOP disabled would cause the cimserver -+## to exit and the test suite to fail. -+## -+## NOTE: The test is run once with authentication enabled, and once without -+## authentication enabled. -+## -+############################################################################### -+OOPProvFail_TS1a_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true -+OOPProvFail_TS1b_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=false -+OOPProvFail_TS1_TEST_CMDS = \ -+ $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS1 -+ -+run_OOPProvFail_TS1: -+ $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \ -+ CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1a_CONFIG_OPTIONS)" \ -+ TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)" -+ $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \ -+ CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS1b_CONFIG_OPTIONS)" \ -+ TESTSUITE_CMDS="$(OOPProvFail_TS1_TEST_CMDS)" -+ -+############################################################################### -+## OOPProvFail Test Suite 2: OOP Provider Module Failure on IndicationService -+## Initialization Tests -+## -+## Configuration Options: forceProviderProcesses=true -+## enableAuthentication=true -+## -+## NOTE: Regardless of the setting of PEGASUS_DEFAULT_ENABLE_OOP, this test -+## suite is always run with OOP enabled. This test suite causes a provider to -+## exit. Running this test suite with OOP disabled would cause the cimserver -+## to exit and the test suite to fail. -+## -+############################################################################### -+OOPProvFail_TS2_CONFIG_OPTIONS = forceProviderProcesses=true enableAuthentication=true -+OOPProvFail_TS2a_TEST_CMDS = \ -+ $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2a -+OOPProvFail_TS2b_TEST_CMDS = \ -+ $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Providers/TestProviders/OOPModuleFailureProvider/testclient@@OOPProvFail_TS2b -+ -+run_OOPProvFail_TS2: -+ $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \ -+ CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \ -+ TESTSUITE_CMDS="$(OOPProvFail_TS2a_TEST_CMDS)" -+ $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \ -+ CIMSERVER_CONFIG_OPTIONS="$(OOPProvFail_TS2_CONFIG_OPTIONS)" \ -+ TESTSUITE_CMDS="$(OOPProvFail_TS2b_TEST_CMDS)" -+ -+############################################################################### - ## Indication SSL Test Suite 1: Indication Testing over HTTPS - ## - ## Configuration Options: (none) ---- pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.cpp.obz5051 2006-05-31 11:42:03.000000000 -0400 -+++ pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -135,8 +135,10 @@ - ~ProviderAgentContainer(); - - Boolean isInitialized(); -+ Uint16 userContext, - - String getModuleName() const; -+ PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback, - - CIMResponseMessage* processMessage(CIMRequestMessage* request); - void unloadIdleProviders(); -@@ -232,6 +234,12 @@ - - /** - Callback function to which response chunks are sent for processing. -+ User Context setting of the provider module served by this Provider -+ Agent. -+ */ -+ Uint16 _userContext; -+ -+ /** - */ - PEGASUS_RESPONSE_CHUNK_CALLBACK_T _responseChunkCallback; - -@@ -243,6 +251,12 @@ - /** - Pipe connection used to read responses from the Provider Agent. - */ -+ Callback function to be called upon detection of failure of a -+ provider module. -+ */ -+ PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T _providerModuleFailCallback; -+ -+ /** - AutoPtr _pipeFromAgent; - /** - Pipe connection used to write requests to the Provider Agent. -@@ -332,13 +346,17 @@ - _userName(userName), - _indicationCallback(indicationCallback), - _responseChunkCallback(responseChunkCallback), -+ Uint16 userContext, - _isInitialized(false), - _subscriptionInitComplete(subscriptionInitComplete) -+ PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback, - { - PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, - "ProviderAgentContainer::ProviderAgentContainer"); -+ _userContext(userContext), - PEG_METHOD_EXIT(); - } -+ _providerModuleFailCallback(providerModuleFailCallback), - - ProviderAgentContainer::~ProviderAgentContainer() - { -@@ -520,7 +538,7 @@ - } - #elif defined (PEGASUS_OS_OS400) - -- //Out of provider support for OS400 goes here when needed. -+ //Out of process provider support for OS400 goes here when needed. - - #else - -@@ -903,24 +921,6 @@ - // connection - // - { -- // -- // If not a clean shutdown, log a warning message in case module -- // included indication providers -- // -- if (!cleanShutdown) -- { -- Logger::put_l( -- Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING, -- "ProviderManager.OOPProviderManagerRouter." -- "OOP_PROVIDER_MODULE_FAILURE_DETECTED", -- "A failure was detected in provider module $0. The" -- " generation of indications by providers in this module" -- " may be affected. To ensure these providers are" -- " serving active subscriptions, disable and then" -- " re-enable this module using the cimprovider command.", -- _moduleName); -- } -- - AutoMutex tableLock(_outstandingRequestTableMutex); - - CIMResponseMessage* response = -@@ -945,6 +945,21 @@ - // We're uninitializing, so do not propagate the exception - PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2, - "Ignoring _uninitialize() exception."); -+ -+ // -+ // If not a clean shutdown, call the provider module failure -+ // callback -+ // -+ if (!cleanShutdown) -+ { -+ // -+ // Call the provider module failure callback to -+ // communicate the failure to the Provider Manager Service -+ // Provider Manager Service will inform Indication Service -+ // -+ _providerModuleFailCallback (_moduleName, _userName, -+ _userContext); -+ } - } - - PEG_METHOD_EXIT(); -@@ -1389,13 +1404,15 @@ - - OOPProviderManagerRouter::OOPProviderManagerRouter( - PEGASUS_INDICATION_CALLBACK_T indicationCallback, -- PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback) -+ PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback, -+ PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback) - { - PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, - "OOPProviderManagerRouter::OOPProviderManagerRouter"); - - _indicationCallback = indicationCallback; - _responseChunkCallback = responseChunkCallback; -+ _providerModuleFailCallback = providerModuleFailCallback; - _subscriptionInitComplete = false; - - PEG_METHOD_EXIT(); -@@ -1653,6 +1670,30 @@ - } - else - { -+ // -+ // Look up the Provider Agent for this module instance and requesting -+ // user -+ // -+ ProviderAgentContainer* pa = _lookupProviderAgent(providerModule, -+ request); -+ PEGASUS_ASSERT(pa != 0); -+ -+ // -+ // Forward the request to the provider agent -+ // -+ response.reset(pa->processMessage(request)); -+ } -+ -+ response->syncAttributes(request); -+ -+ PEG_METHOD_EXIT(); -+ return response.release(); -+} -+ -+ProviderAgentContainer* OOPProviderManagerRouter::_lookupProviderAgent( -+ const CIMInstance& providerModule, -+ CIMRequestMessage* request) -+{ - // Retrieve the provider module name - String moduleName; - CIMValue nameValue = providerModule.getProperty( -@@ -1675,7 +1716,7 @@ - - if (userContext == 0) - { -- userContext = PG_PROVMODULE_USERCTXT_PRIVILEGED; -+ userContext = PEGASUS_DEFAULT_PROV_USERCTXT; - } - - String userName; -@@ -1703,7 +1744,7 @@ - } - else if (userContext == PG_PROVMODULE_USERCTXT_DESIGNATED) - { -- // Retrieve the provider module name -+ // Retrieve the provider module designated user property value - providerModule.getProperty(providerModule.findProperty( - PEGASUS_PROPERTYNAME_MODULE_DESIGNATEDUSER)).getValue(). - get(userName); -@@ -1725,26 +1766,6 @@ - PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL4, - "User name = " + userName); - -- // Look up the Provider Agent for this module and user -- ProviderAgentContainer* pa = _lookupProviderAgent(moduleName, userName); -- PEGASUS_ASSERT(pa != 0); -- -- // -- // Forward the request to the provider agent -- // -- response.reset(pa->processMessage(request)); -- } -- -- response->syncAttributes(request); -- -- PEG_METHOD_EXIT(); -- return response.release(); --} -- --ProviderAgentContainer* OOPProviderManagerRouter::_lookupProviderAgent( -- const String& moduleName, -- const String& userName) --{ - ProviderAgentContainer* pa = 0; - String key = moduleName + ":" + userName; - -@@ -1752,7 +1773,9 @@ - if (!_providerAgentTable.lookup(key, pa)) - { - pa = new ProviderAgentContainer( -- moduleName, userName, _indicationCallback, _responseChunkCallback, -+ moduleName, userName, userContext, -+ _indicationCallback, _responseChunkCallback, -+ _providerModuleFailCallback, - _subscriptionInitComplete); - _providerAgentTable.insert(key, pa); - } ---- pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.h.obz5051 2006-02-28 14:53:30.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.h 2006-05-31 12:18:40.000000000 -0400 -@@ -79,6 +79,13 @@ - static void responseChunkCallback( - CIMRequestMessage* request, CIMResponseMessage* response); - -+ /** -+ Callback function to be called upon detection of failure of a -+ provider module. -+ */ -+ static void providerModuleFailureCallback (const String & moduleName, -+ const String & userName, Uint16); -+ - private: - ProviderManagerService(); - -@@ -100,8 +107,8 @@ - - void _updateProviderModuleStatus( - CIMInstance& providerModule, -- Uint16 fromStatus, -- Uint16 toStatus); -+ const Array& removeStatus, -+ const Array& appendStatus); - - static ProviderManagerService* providerManagerService; - ---- pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp.obz5051 2006-05-31 11:42:03.000000000 -0400 -+++ pegasus/src/Pegasus/ProviderManager2/ProviderManagerService.cpp 2006-05-31 12:26:38.000000000 -0400 -@@ -55,7 +55,6 @@ - #include - #include - #include --#include - - #include - -@@ -117,7 +116,8 @@ - if (forceProviderProcesses) - { - _oopProviderManagerRouter = new OOPProviderManagerRouter( -- indicationCallback, responseChunkCallback); -+ indicationCallback, responseChunkCallback, -+ providerModuleFailureCallback); - } - else - { -@@ -126,7 +126,8 @@ - } - #else - _oopProviderManagerRouter = new OOPProviderManagerRouter( -- indicationCallback, responseChunkCallback); -+ indicationCallback, responseChunkCallback, -+ providerModuleFailureCallback); - - if (!forceProviderProcesses) - { -@@ -453,9 +454,16 @@ - dynamic_cast(response); - if (emResp->cimException.getCode() == CIM_ERR_SUCCESS) - { -- _updateProviderModuleStatus( -- providerModule, CIM_MSE_OPSTATUS_VALUE_STOPPED, -- CIM_MSE_OPSTATUS_VALUE_OK); -+ // -+ // On a successful enable, remove Stopped status and -+ // append OK status -+ // -+ Array removeStatus; -+ Array appendStatus; -+ removeStatus.append (CIM_MSE_OPSTATUS_VALUE_STOPPED); -+ appendStatus.append (CIM_MSE_OPSTATUS_VALUE_OK); -+ _updateProviderModuleStatus -+ ( providerModule, removeStatus, appendStatus ); - } - } - catch (Exception& e) -@@ -490,12 +498,17 @@ - - try - { -- // Change module status from OK to STOPPING -+ // -+ // On issuing a disable request, append Stopping status -+ // Do not remove existing status -+ // - if (updateModuleStatus) - { -- _updateProviderModuleStatus( -- providerModule, CIM_MSE_OPSTATUS_VALUE_OK, -- CIM_MSE_OPSTATUS_VALUE_STOPPING); -+ Array removeStatus; -+ Array appendStatus; -+ appendStatus.append (CIM_MSE_OPSTATUS_VALUE_STOPPING); -+ _updateProviderModuleStatus -+ ( providerModule, removeStatus, appendStatus ); - } - - // Forward the request to the ProviderManager -@@ -508,21 +521,44 @@ - dynamic_cast(response); - if (dmResp->cimException.getCode() != CIM_ERR_SUCCESS) - { -- // Disable operation failed. Module not stopped. -- _updateProviderModuleStatus( -- providerModule, CIM_MSE_OPSTATUS_VALUE_STOPPING, -- CIM_MSE_OPSTATUS_VALUE_OK); -+ // -+ // On an unsuccessful disable, remove Stopping status -+ // -+ Array removeStatus; -+ Array appendStatus; -+ removeStatus.append (CIM_MSE_OPSTATUS_VALUE_STOPPING); -+ _updateProviderModuleStatus -+ ( providerModule, removeStatus, appendStatus ); - } - else - { - // Disable may or may not have been successful, - // depending on whether there are outstanding requests. -- // Use last operationalStatus entry. -- _updateProviderModuleStatus( -- providerModule, CIM_MSE_OPSTATUS_VALUE_STOPPING, -- dmResp->operationalStatus[ -+ // Remove Stopping status -+ // Append status, if any, from disable module response -+ Array removeStatus; -+ Array appendStatus; -+ removeStatus.append (CIM_MSE_OPSTATUS_VALUE_STOPPING); -+ if (dmResp->operationalStatus.size() > 0) -+ { -+ // -+ // On a successful disable, remove an OK or a Degraded -+ // status, if present -+ // -+ if (dmResp->operationalStatus[ -+ dmResp->operationalStatus.size()-1] == -+ CIM_MSE_OPSTATUS_VALUE_STOPPED) -+ { -+ removeStatus.append (CIM_MSE_OPSTATUS_VALUE_OK); -+ removeStatus.append -+ (CIM_MSE_OPSTATUS_VALUE_DEGRADED); -+ } -+ appendStatus.append (dmResp->operationalStatus[ - dmResp->operationalStatus.size()-1]); - } -+ _updateProviderModuleStatus( -+ providerModule, removeStatus, appendStatus); -+ } - } - } - catch (Exception& e) -@@ -666,7 +702,7 @@ - providerModule = pidc.getModule(); - } - -- Uint16 userContext = 0; -+ Uint16 userContext = PEGASUS_DEFAULT_PROV_USERCTXT; - Uint32 pos = providerModule.findProperty( - PEGASUS_PROPERTYNAME_MODULE_USERCONTEXT); - if (pos != PEG_NOT_FOUND) -@@ -787,10 +823,16 @@ - } - - // Updates the providerModule instance and the ProviderRegistrationManager -+// -+// This method is used to update the provider module status when the module is -+// disabled or enabled. If a Degraded status has been set (appended) to the -+// OperationalStatus, it is cleared (removed) when the module is disabled or -+// enabled. -+// - void ProviderManagerService::_updateProviderModuleStatus( - CIMInstance& providerModule, -- Uint16 fromStatus, -- Uint16 toStatus) -+ const Array& removeStatus, -+ const Array& appendStatus) - { - PEG_METHOD_ENTER(TRC_PROVIDERMANAGER, - "ProviderManagerService::_updateProviderModuleStatus"); -@@ -808,28 +850,10 @@ - pos = providerModule.findProperty(CIMName("OperationalStatus")); - PEGASUS_ASSERT(pos != PEG_NOT_FOUND); - CIMProperty operationalStatusProperty = providerModule.getProperty(pos); -- CIMValue operationalStatusValue = operationalStatusProperty.getValue(); -- -- if (!operationalStatusValue.isNull()) -- { -- operationalStatusValue.get(operationalStatus); -- } - -- // -- // update module status -- // -- for (Uint32 i = operationalStatus.size(); i > 0; i--) -- { -- if (operationalStatus[i-1] == fromStatus) -- { -- operationalStatus.remove(i-1); -- } -- } -- -- operationalStatus.append(toStatus); -- -- if (_providerRegistrationManager->setProviderModuleStatus( -- providerModuleName, operationalStatus) == false) -+ if (_providerRegistrationManager->updateProviderModuleStatus( -+ providerModuleName, removeStatus, appendStatus, operationalStatus) == -+ false) - { - throw PEGASUS_CIM_EXCEPTION_L( - CIM_ERR_FAILED, -@@ -947,4 +971,140 @@ - - } - -+void ProviderManagerService::providerModuleFailureCallback -+ (const String & moduleName, -+ const String & userName, -+ Uint16 userContext) -+{ -+ PEG_METHOD_ENTER (TRC_PROVIDERMANAGER, -+ "ProviderManagerService::providerModuleFailureCallback"); -+ -+ if (userContext == PG_PROVMODULE_USERCTXT_REQUESTOR) -+ { -+ Logger::put_l ( -+ Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING, -+ "ProviderManager.OOPProviderManagerRouter." -+ "OOP_PROVIDER_MODULE_USER_CTXT_FAILURE_DETECTED", -+ "A failure was detected in provider module $0 with" -+ " user context $1.", -+ moduleName, userName); -+ } -+ else // not requestor context -+ { -+ Logger::put_l ( -+ Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING, -+ "ProviderManager.OOPProviderManagerRouter." -+ "OOP_PROVIDER_MODULE_FAILURE_DETECTED", -+ "A failure was detected in provider module $0.", -+ moduleName); -+ } -+ -+ // -+ // Create Notify Provider Fail request message -+ // -+ CIMNotifyProviderFailRequestMessage * request = -+ new CIMNotifyProviderFailRequestMessage -+ (XmlWriter::getNextMessageId (), -+ moduleName, -+ userName, -+ QueueIdStack ()); -+ -+ // -+ // Send Notify Provider Fail request message to Indication Service -+ // -+ if (_indicationServiceQueueId == PEG_NOT_FOUND) -+ { -+ Array serviceIds; -+ -+ providerManagerService->find_services -+ (PEGASUS_QUEUENAME_INDICATIONSERVICE, 0, 0, &serviceIds); -+ PEGASUS_ASSERT (serviceIds.size () != 0); -+ -+ _indicationServiceQueueId = serviceIds [0]; -+ } -+ -+ request->queueIds = QueueIdStack -+ (_indicationServiceQueueId, providerManagerService->getQueueId ()); -+ -+ AsyncLegacyOperationStart * asyncRequest = new AsyncLegacyOperationStart -+ (providerManagerService->get_next_xid (), -+ 0, -+ _indicationServiceQueueId, -+ request, -+ _indicationServiceQueueId); -+ -+ AutoPtr asyncReply -+ (providerManagerService->SendWait (asyncRequest)); -+ -+ AutoPtr response -+ (reinterpret_cast -+ ((dynamic_cast -+ (asyncReply.get ()))->get_result ())); -+ -+ if (response->cimException.getCode () != CIM_ERR_SUCCESS) -+ { -+ PEG_TRACE_STRING (TRC_DISCARDED_DATA, Tracer::LEVEL2, -+ "Unexpected exception in providerModuleFailureCallback: " + -+ response->cimException.getMessage ()); -+ } -+ else -+ { -+ // -+ // Successful response -+ // Examine result to see if any subscriptions were affected -+ // -+ if (response->numSubscriptionsAffected > 0) -+ { -+ // -+ // Subscriptions were affected -+ // Update the provider module status to Degraded -+ // -+ try -+ { -+ CIMInstance providerModule; -+ CIMKeyBinding keyBinding( -+ _PROPERTY_PROVIDERMODULE_NAME, -+ moduleName, -+ CIMKeyBinding::STRING); -+ Array kbArray; -+ kbArray.append(keyBinding); -+ CIMObjectPath modulePath("", PEGASUS_NAMESPACENAME_INTEROP, -+ PEGASUS_CLASSNAME_PROVIDERMODULE, kbArray); -+ providerModule = -+ providerManagerService->_providerRegistrationManager-> -+ getInstance( -+ modulePath, false, false, CIMPropertyList()); -+ -+ Array removeStatus; -+ Array appendStatus; -+ removeStatus.append(CIM_MSE_OPSTATUS_VALUE_OK); -+ appendStatus.append(CIM_MSE_OPSTATUS_VALUE_DEGRADED); -+ providerManagerService->_updateProviderModuleStatus( -+ providerModule, removeStatus, appendStatus); -+ } -+ catch (const Exception & e) -+ { -+ PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2, -+ "Failed to update provider module status: " + -+ e.getMessage()); -+ } -+ -+ // -+ // Log a warning message since subscriptions were affected -+ // -+ Logger::put_l ( -+ Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING, -+ "ProviderManager.OOPProviderManagerRouter." -+ "OOP_PROVIDER_MODULE_SUBSCRIPTIONS_AFFECTED", -+ "The generation of indications by providers in module $0 " -+ "may be affected. To ensure these providers are serving " -+ "active subscriptions, disable and then re-enable this " -+ "module using the cimprovider command.", -+ moduleName); -+ } -+ } -+ -+ PEG_METHOD_EXIT(); -+} -+ - PEGASUS_NAMESPACE_END ---- pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.h.obz5051 2006-02-28 14:53:30.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/OOPProviderManagerRouter.h 2006-05-31 12:18:40.000000000 -0400 -@@ -51,6 +51,9 @@ - - PEGASUS_NAMESPACE_BEGIN - -+typedef void (*PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T)(const String &, -+ const String &, Uint16); -+ - class ProviderAgentContainer; - - typedef HashTable, -@@ -62,7 +65,8 @@ - public: - OOPProviderManagerRouter( - PEGASUS_INDICATION_CALLBACK_T indicationCallback, -- PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback); -+ PEGASUS_RESPONSE_CHUNK_CALLBACK_T responseChunkCallback, -+ PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T providerModuleFailCallback); - - virtual ~OOPProviderManagerRouter(); - -@@ -85,13 +89,12 @@ - - /** - Return a pointer to the ProviderAgentContainer for the specified -- moduleName and userName. If no ProviderAgentContainer exists for -- this moduleName/userName pair, one is created in an uninitialized -- state. -+ module instance and requesting user. If no appropriate -+ ProviderAgentContainer exists, one is created in an uninitialized state. - */ - ProviderAgentContainer* _lookupProviderAgent( -- const String& moduleName, -- const String& userName); -+ const CIMInstance& providerModule, -+ CIMRequestMessage* request); - - /** - Return an array of pointers to ProviderAgentContainers for the -@@ -122,6 +125,12 @@ - PEGASUS_RESPONSE_CHUNK_CALLBACK_T _responseChunkCallback; - - /** -+ Callback function to be called upon detection of failure of a -+ provider module. -+ */ -+ PEGASUS_PROVIDERMODULEFAIL_CALLBACK_T _providerModuleFailCallback; -+ -+ /** - The _providerAgentTable contains a ProviderAgentContainer entry for - each of the Provider Agent processes for which a request has been - processed. ProviderAgentContainer objects are persistent; once one ---- pegasus/src/Pegasus/IndicationService/SubscriptionTable.cpp.obz5051 2006-01-30 11:17:55.000000000 -0500 -+++ pegasus/src/Pegasus/IndicationService/SubscriptionTable.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -159,11 +159,11 @@ - return matchingSubscriptions; - } - --Array SubscriptionTable::getAndUpdateProviderSubscriptions ( -+Array SubscriptionTable::reflectProviderDisable ( - const CIMInstance & provider) - { - PEG_METHOD_ENTER (TRC_INDICATION_SERVICE, -- "SubscriptionTable::getAndUpdateProviderSubscriptions"); -+ "SubscriptionTable::reflectProviderDisable"); - - Array providerSubscriptions; - -@@ -230,40 +230,9 @@ - if (providerIndex != PEG_NOT_FOUND) - { - tableValue.providers.remove (providerIndex); -- if (tableValue.providers.size () > 0) -- { -- // -- // At least one provider is still serving the -- // subscription -- // Update entry in Active Subscriptions table -- // -- _removeActiveSubscriptionsEntry -- (activeSubscriptionsKey); -- _insertActiveSubscriptionsEntry -- (tableValue.subscription, tableValue.providers); -- } -- else -- { -- // -- // If the terminated provider was the only provider -- // serving the subscription, implement the -- // subscription's On Fatal Error Policy -- // -- Boolean removedOrDisabled = -- _subscriptionRepository->reconcileFatalError -- (tableValue.subscription); -- _removeActiveSubscriptionsEntry -- (activeSubscriptionsKey); -- if (!removedOrDisabled) -- { -- // -- // If subscription was not disabled or deleted -- // Update entry in Active Subscriptions table -- // -- _insertActiveSubscriptionsEntry -- (tableValue.subscription, tableValue.providers); -- } -- } -+ -+ _updateSubscriptionProviders (activeSubscriptionsKey, -+ tableValue.subscription, tableValue.providers); - } - else - { -@@ -293,6 +262,159 @@ - return providerSubscriptions; - } - -+Array -+SubscriptionTable::reflectProviderModuleFailure -+ (const String & moduleName, -+ const String & userName, -+ Boolean authenticationEnabled) -+{ -+ PEG_METHOD_ENTER (TRC_INDICATION_SERVICE, -+ "SubscriptionTable::reflectProviderModuleFailure"); -+ -+ Array providerModuleSubscriptions; -+ -+ // -+ // Iterate through the subscription table to find subscriptions served by -+ // a provider in the specified module, with the specified userName as the -+ // subscription creator -+ // NOTE: updating entries (remove and insert) while iterating through the -+ // table is not allowed -+ // The SubscriptionTable first iterates through the active subscriptions -+ // table to find matching subscriptions served by a provider in the -+ // specified module, then looks up and updates each affected subscription -+ // -+ { -+ // -+ // Acquire and hold the write lock during the entire -+ // lookup/remove/insert process, allowing competing threads to apply -+ // their logic over a consistent view of the data. -+ // Do not call any other methods that need -+ // _activeSubscriptionsTableLock. -+ // -+ WriteLock lock (_activeSubscriptionsTableLock); -+ -+ for (ActiveSubscriptionsTable::Iterator i = -+ _activeSubscriptionsTable.start (); i; i++) -+ { -+ ActiveSubscriptionsTableEntry tableValue; -+ // -+ // Get subscription creator -+ // -+ tableValue = i.value (); -+ String creator; -+ CIMValue creatorValue = tableValue.subscription.getProperty -+ (tableValue.subscription.findProperty -+ (PEGASUS_PROPERTYNAME_INDSUB_CREATOR)).getValue(); -+ creatorValue.get (creator); -+ -+ Array failedProviderList; -+ for (Uint32 j = 0; j < tableValue.providers.size (); j++) -+ { -+ // -+ // Get provider module name -+ // -+ String providerModuleName; -+ CIMValue nameValue = -+ tableValue.providers [j].providerModule.getProperty -+ (tableValue.providers [j].providerModule.findProperty -+ (_PROPERTY_NAME)).getValue (); -+ nameValue.get (providerModuleName); -+ -+ // -+ // Get module user context setting -+ // -+ Uint16 moduleContext = PEGASUS_DEFAULT_PROV_USERCTXT; -+ CIMValue contextValue = -+ tableValue.providers [j].providerModule.getProperty -+ (tableValue.providers [j].providerModule.findProperty -+ (PEGASUS_PROPERTYNAME_MODULE_USERCONTEXT)).getValue (); -+ if (!contextValue.isNull ()) -+ { -+ contextValue.get (moduleContext); -+ } -+ -+ // -+ // If provider module name matches, -+ // add provider to the list of failed providers -+ // -+ if (providerModuleName == moduleName) -+ { -+ // -+ // If authentication is enabled, and module was run as -+ // requestor, subscription creator must also match module -+ // user context name, to add provider to the list of -+ // failed providers -+ // -+ if ((moduleContext != PG_PROVMODULE_USERCTXT_REQUESTOR) || -+ (!authenticationEnabled) || (creator == userName)) -+ { -+ // -+ // Add the provider to the list -+ // -+ failedProviderList.append -+ (tableValue.providers [j]); -+ } -+ } // if provider module name matches -+ } // for each subscription provider -+ -+ // -+ // If there were any failed providers, add the subscription -+ // entry to the list of affected subscriptions -+ // -+ if (failedProviderList.size () > 0) -+ { -+ ActiveSubscriptionsTableEntry subscription; -+ subscription.subscription = tableValue.subscription; -+ subscription.providers = failedProviderList; -+ providerModuleSubscriptions.append (subscription); -+ } -+ } -+ -+ // -+ // Look up and update hash table entry for each affected subscription -+ // -+ for (Uint32 k = 0; k < providerModuleSubscriptions.size (); k++) -+ { -+ // -+ // Update the entry in the active subscriptions hash table -+ // -+ CIMObjectPath activeSubscriptionsKey = -+ _generateActiveSubscriptionsKey -+ (providerModuleSubscriptions [k].subscription.getPath ()); -+ ActiveSubscriptionsTableEntry tableValue; -+ if (_activeSubscriptionsTable.lookup (activeSubscriptionsKey, -+ tableValue)) -+ { -+ Array updatedProviderList; -+ for (Uint32 l = 0; l < tableValue.providers.size (); l++) -+ { -+ String providerModuleName; -+ CIMValue nameValue = -+ tableValue.providers [l].providerModule.getProperty -+ (tableValue.providers [l].providerModule.findProperty -+ (_PROPERTY_NAME)).getValue (); -+ nameValue.get (providerModuleName); -+ if (providerModuleName != moduleName) -+ { -+ // -+ // Provider is not in the failed module -+ // Append provider to list of providers still serving -+ // the subscription -+ // -+ updatedProviderList.append (tableValue.providers [l]); -+ } -+ } -+ -+ _updateSubscriptionProviders (activeSubscriptionsKey, -+ tableValue.subscription, updatedProviderList); -+ } -+ } -+ } -+ -+ PEG_METHOD_EXIT (); -+ return providerModuleSubscriptions; -+} -+ - CIMObjectPath SubscriptionTable::_generateActiveSubscriptionsKey ( - const CIMObjectPath & subscription) const - { -@@ -494,6 +616,51 @@ - PEG_METHOD_EXIT (); - } - -+void SubscriptionTable::_updateSubscriptionProviders -+ (const CIMObjectPath & activeSubscriptionsKey, -+ const CIMInstance & subscription, -+ const Array & updatedProviderList) -+{ -+ PEG_METHOD_ENTER (TRC_INDICATION_SERVICE, -+ "SubscriptionTable::_updateSubscriptionProviders"); -+ -+ if (updatedProviderList.size () > 0) -+ { -+ // -+ // At least one provider is still serving the -+ // subscription -+ // Update entry in Active Subscriptions table -+ // -+ _removeActiveSubscriptionsEntry (activeSubscriptionsKey); -+ _insertActiveSubscriptionsEntry (subscription, updatedProviderList); -+ } -+ else -+ { -+ // -+ // The disabled or failed provider(s) was (were) the only provider(s) -+ // serving the subscription -+ // Implement the subscription's On Fatal Error Policy -+ // -+ Boolean removedOrDisabled = -+ _subscriptionRepository->reconcileFatalError (subscription); -+ _removeActiveSubscriptionsEntry (activeSubscriptionsKey); -+ if (!removedOrDisabled) -+ { -+ // -+ // If subscription was not disabled or deleted -+ // Update entry in Active Subscriptions table -+ // Note that in this case the updatedProviderList is -+ // empty - no providers are serving the subscription -+ // currently -+ // -+ _insertActiveSubscriptionsEntry (subscription, -+ updatedProviderList); -+ } -+ } -+ -+ PEG_METHOD_EXIT (); -+} -+ - void SubscriptionTable::insertSubscription ( - const CIMInstance & subscription, - const Array & providers, ---- pegasus/src/Pegasus/IndicationService/SubscriptionTable.h.obz5051 2006-01-30 11:17:55.000000000 -0500 -+++ pegasus/src/Pegasus/IndicationService/SubscriptionTable.h 2006-05-31 12:18:40.000000000 -0400 -@@ -289,10 +289,41 @@ - - @return list of CIMInstance subscriptions - */ -- Array getAndUpdateProviderSubscriptions ( -+ Array reflectProviderDisable ( - const CIMInstance & provider); - - /** -+ Retrieves a list of subscription table entries for subscriptions that -+ were being served by providers in the specified provider module, where -+ the subscription creator matches the specified provider module userName. -+ The Active Subscriptions table is updated to reflect the fact that these -+ subscriptions are no longer being served by the provider(s) in the -+ failed provider module. -+ This method is called when notification is received that the specified -+ provider module has failed. In the Active Subscriptions table, any -+ provider in the specified provider module is removed from the list of -+ providers serving the subscription. -+ The returned list of Active Subscriptions table entries includes for -+ each subscription only those providers that are in the specified -+ (failed) provider module and therefore are no longer serving the -+ subscription. -+ -+ @param moduleName the provider module name -+ @param userName the user name for the context in which -+ the provider module was invoked -+ @param authenticationEnabled indicates whether authentication is -+ currently enabled -+ -+ @return list of ActiveSubscriptionsTableEntry structs including the -+ subscriptions served by providers in the specified provider -+ module -+ */ -+ Array reflectProviderModuleFailure ( -+ const String & moduleName, -+ const String & userName, -+ Boolean authenticationEnabled); -+ -+ /** - Determines if the specified provider is in the list of providers - serving the subscription. - -@@ -431,6 +462,21 @@ - const String & key); - - /** -+ Updates the providers for an entry in the Active Subscriptions table. -+ The caller must first lock the _activeSubscriptionsTableLock for write -+ access. -+ -+ @param activeSubscriptionsKey the key of the entry to update -+ @param subscription the subscription instance for the entry -+ @param updatedProviderList the updated list of providers for the -+ entry (may be empty) -+ */ -+ void _updateSubscriptionProviders ( -+ const CIMObjectPath & activeSubscriptionsKey, -+ const CIMInstance & subscription, -+ const Array & updatedProviderList); -+ -+ /** - Active Subscriptions information table. Access to this table is - controlled by the _activeSubscriptionsTableLock. - */ ---- pegasus/src/Pegasus/IndicationService/IndicationService.cpp.obz5051 2006-02-10 17:20:43.000000000 -0500 -+++ pegasus/src/Pegasus/IndicationService/IndicationService.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -110,6 +110,7 @@ - _cimRepository(repository) - { - _enableSubscriptionsForNonprivilegedUsers = false; -+ _authenticationEnabled = true; - - try - { -@@ -126,6 +127,7 @@ - } - else - { -+ _authenticationEnabled = false; - // Authentication needs to be enabled to perform authorization - // tests. - _enableSubscriptionsForNonprivilegedUsers = true; -@@ -357,6 +359,17 @@ - } - break; - -+ case CIM_NOTIFY_PROVIDER_FAIL_REQUEST_MESSAGE: -+ try -+ { -+ _handleNotifyProviderFailRequest (message); -+ } -+ catch (...) -+ { -+ ; -+ } -+ break; -+ - default: - // - // A message type not supported by the Indication Service -@@ -1410,7 +1423,7 @@ - (const Message* message) - { - PEG_METHOD_ENTER (TRC_INDICATION_SERVICE, -- "IndicationService::_handleEnumerateInstancesNamesRequest"); -+ "IndicationService::_handleEnumerateInstanceNamesRequest"); - - CIMEnumerateInstanceNamesRequestMessage* request = - (CIMEnumerateInstanceNamesRequestMessage*) message; -@@ -2879,12 +2892,12 @@ - // - // Get list of affected subscriptions - // -- // _subscriptionTable->getAndUpdateProviderSubscriptions also updates the -+ // _subscriptionTable->reflectProviderDisable also updates the - // Active Subscriptions hash table, and implements each subscription's - // On Fatal Error policy, if necessary - // - providerSubscriptions.clear (); -- providerSubscriptions = _subscriptionTable->getAndUpdateProviderSubscriptions -+ providerSubscriptions = _subscriptionTable->reflectProviderDisable - (providers [i]); - - if (providerSubscriptions.size () > 0) -@@ -3240,6 +3253,41 @@ - PEG_METHOD_EXIT (); - } - -+void IndicationService::_handleNotifyProviderFailRequest -+ (Message * message) -+{ -+ PEG_METHOD_ENTER (TRC_INDICATION_SERVICE, -+ "IndicationService::_handleNotifyProviderFailRequest"); -+ -+ CIMNotifyProviderFailRequestMessage * request = -+ dynamic_cast (message); -+ -+ String moduleName = request->moduleName; -+ String userName = request->userName; -+ -+ // -+ // Determine providers in module that were serving active subscriptions -+ // and update the Active Subscriptions Table -+ // -+ Array providerModuleSubscriptions = -+ _subscriptionTable->reflectProviderModuleFailure -+ (moduleName, userName, _authenticationEnabled); -+ -+ // -+ // FUTURE: Attempt to recreate the subscription state -+ // -+ -+ // -+ // Send response -+ // -+ CIMResponseMessage * response = request->buildResponse (); -+ CIMNotifyProviderFailResponseMessage * failResponse = -+ (CIMNotifyProviderFailResponseMessage *) response; -+ failResponse->numSubscriptionsAffected = -+ providerModuleSubscriptions.size (); -+ _enqueueResponse (request, response); -+} -+ - Boolean IndicationService::_canCreate ( - CIMInstance & instance, - const CIMNamespaceName & nameSpace) -@@ -6366,6 +6414,15 @@ - return; - } - -+ // -+ // Update subscription hash tables -+ // -+ _subscriptionTable->removeSubscription -+ (subscription, -+ indicationSubclasses, -+ nameSpace, -+ indicationProviders); -+ - CIMRequestMessage * aggRequest = 0; - - if (origRequest == 0) -@@ -6856,21 +6913,6 @@ - } - - // -- // Update subscription hash tables -- // Delete Instance, Modify Instance, or Delete Referencing or Expired -- // Subscription -- // -- CIMDeleteSubscriptionRequestMessage * request = -- (CIMDeleteSubscriptionRequestMessage *) -- operationAggregate->getRequest (0); -- -- _subscriptionTable->removeSubscription -- (request->subscriptionInstance, -- operationAggregate->getIndicationSubclasses (), -- request->nameSpace, -- checkProviders); -- -- // - // For Delete Instance or Modify Instance request, send response - // - if (operationAggregate->requiresResponse ()) ---- pegasus/src/Pegasus/IndicationService/IndicationService.h.obz5051 2006-01-30 11:17:55.000000000 -0500 -+++ pegasus/src/Pegasus/IndicationService/IndicationService.h 2006-05-31 12:18:40.000000000 -0400 -@@ -173,6 +173,16 @@ - void _handleNotifyProviderEnableRequest (const Message * message); - - /** -+ Notifies the Indication Service that failure of a provider module that -+ included at least one indication provider has been detected. -+ The Indication Service retrieves the subscriptions served by providers -+ in the failed module. The Indication Service returns in the response -+ the number of affected subscriptions, so the sender of the request -+ knows if any subscriptions were affected. -+ */ -+ void _handleNotifyProviderFailRequest (Message * message); -+ -+ /** - Determines if it is legal to create an instance. - Checks for existence of all key and required properties. Checks that - properties that MUST NOT exist (based on values of other properties), -@@ -1186,6 +1196,12 @@ - Boolean _enableSubscriptionsForNonprivilegedUsers; - - /** -+ Boolean indicating whether authentication is currently enabled in the -+ CIM Server. -+ */ -+ Boolean _authenticationEnabled; -+ -+ /** - Gets the indication class specified by the subscription filter query. - - @param instance the subscription instance ---- pegasus/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationManager.cpp.obz5051 2006-03-10 16:47:07.000000000 -0500 -+++ pegasus/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationManager.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -1719,53 +1719,48 @@ - const String & providerModuleName) - { - Array _providerModuleStatus; -- Array instances; -- -- // -- // create the key by using providerModuleName and MODULE_KEY -- // -- String _moduleKey = _generateKey(providerModuleName, MODULE_KEY); -- -- // -- // Find the entry whose key's value is same as _moduleKey -- // get provider module status from the value -- // -- ProviderRegistrationTable* _providerModule = 0; - - ReadLock lock(_registrationTableLock); - -- if (!_registrationTable->table.lookup(_moduleKey, _providerModule)) -- { --// l10n -- -- // throw (CIMException(CIM_ERR_FAILED, MODULE_NOT_FOUND)); -- -- MessageLoaderParms mlp(MessageLoaderParms(MODULE_NOT_FOUND_KEY, MODULE_NOT_FOUND)); -+ _providerModuleStatus = _getProviderModuleStatus (providerModuleName); - -- throw (CIMException(CIM_ERR_FAILED, mlp)); -+ return (_providerModuleStatus); - } - -- instances = _providerModule->getInstances(); -+Boolean ProviderRegistrationManager::updateProviderModuleStatus( -+ const String& providerModuleName, -+ const Array& removeStatus, -+ const Array& appendStatus, -+ Array& outStatus) -+{ -+ WriteLock lock(_registrationTableLock); -+ -+ outStatus = _getProviderModuleStatus (providerModuleName); - - // -- // ATTN-CAKG-P2-20020821: Check for null status? -+ // Remove any status elements to be removed - // -- instances[0].getProperty(instances[0].findProperty -- (_PROPERTY_OPERATIONALSTATUS)).getValue().get(_providerModuleStatus); -- -- return (_providerModuleStatus); -+ for (Uint32 j = 0; j < removeStatus.size(); j++) -+ { -+ for (Uint32 i = outStatus.size(); i > 0; i--) -+ { -+ if (outStatus[i-1] == removeStatus[j]) -+ { -+ outStatus.remove(i-1); -+ } -+ } - } - --Boolean ProviderRegistrationManager::setProviderModuleStatus( -- const String & providerModuleName, -- Array status) --{ - // -- // create the key by using providerModuleName and MODULE_KEY -+ // Append any status elements to be appended, if not already in the array - // -- String _moduleKey = _generateKey(providerModuleName, MODULE_KEY); -- -- WriteLock lock(_registrationTableLock); -+ for (Uint32 k = 0; k < appendStatus.size(); k++) -+ { -+ if (!Contains (outStatus, appendStatus[k])) -+ { -+ outStatus.append(appendStatus[k]); -+ } -+ } - - // - // find the instance from repository -@@ -1784,7 +1779,7 @@ - // - _repository->setProperty( - PEGASUS_NAMESPACENAME_INTEROP, -- reference, _PROPERTY_OPERATIONALSTATUS, status); -+ reference, _PROPERTY_OPERATIONALSTATUS, outStatus); - - // - // get instance from the repository -@@ -1800,8 +1795,8 @@ - // - // remove old entry from table - // -+ String _moduleKey = _generateKey(providerModuleName, MODULE_KEY); - ProviderRegistrationTable* _entry = 0; -- - if (_registrationTable->table.lookup(_moduleKey, _entry)) - { - delete _entry; -@@ -1815,6 +1810,12 @@ - instances.append(_instance); - _addInstancesToTable(_moduleKey, instances); - } -+ catch (const Exception & e) -+ { -+ PEG_TRACE_STRING(TRC_DISCARDED_DATA, Tracer::LEVEL2, -+ "Failed to update provider module status: " + e.getMessage()); -+ return false; -+ } - catch (...) - { - return (false); -@@ -4061,6 +4062,37 @@ - } - } - -+Array ProviderRegistrationManager::_getProviderModuleStatus( -+ const String& providerModuleName) -+{ -+ Array outStatus; -+ -+ // -+ // Create the key using providerModuleName and MODULE_KEY -+ // -+ String _moduleKey = _generateKey(providerModuleName, MODULE_KEY); -+ -+ // -+ // Look up the module in the provider registration table -+ // -+ ProviderRegistrationTable* _providerModule = 0; -+ if (!_registrationTable->table.lookup(_moduleKey, _providerModule)) -+ { -+ MessageLoaderParms mlp(MessageLoaderParms(MODULE_NOT_FOUND_KEY, -+ MODULE_NOT_FOUND)); -+ throw CIMException(CIM_ERR_FAILED, mlp); -+ } -+ -+ // -+ // Get the Operational Status from the module instance in the table -+ // -+ Array moduleInstances; -+ moduleInstances = _providerModule->getInstances(); -+ moduleInstances[0].getProperty(moduleInstances[0].findProperty( -+ _PROPERTY_OPERATIONALSTATUS)).getValue().get(outStatus); -+ -+ return outStatus; -+} - - Array WildCardNamespaceNames::_nsstr; - Array WildCardNamespaceNames::_nsl; ---- pegasus/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationManager.h.obz5051 2006-01-30 11:18:33.000000000 -0500 -+++ pegasus/src/Pegasus/Server/ProviderRegistrationManager/ProviderRegistrationManager.h 2006-05-31 12:18:40.000000000 -0400 -@@ -328,7 +328,37 @@ - - Array getProviderModuleStatus(const String & providerModuleName); - -- Boolean setProviderModuleStatus(const String & providerModuleName, Array status); -+ /** -+ Updates the Provider Module Status. The value of the -+ OperationalStatus property is updated in the Provider Module -+ instance in the repository, and in the provider registration table. -+ If any removeStatus values are specified, each one of the values -+ found in the current OperationalStatus property value is removed -+ from the array. If any appendStatus values are specified, each one -+ of the values not found in the current OperationalStatus property -+ value is appended to the array. The resulting OperationalStatus -+ property value is returned in the output outStatus parameter. -+ -+ @param providerModuleName String specifying name of the provider -+ module whose status is to be updated -+ -+ @param removeStatus Array of Uint16 specifying values to be -+ removed from the status array (may be empty) -+ -+ @param appendStatus Array of Uint16 specifying values to be -+ appended to the status array (may be empty) -+ -+ @param outStatus OUTPUT Array of Uint16 returning the resulting -+ status array after update -+ -+ @return True if provider module status is successfully updated; -+ False, otherwise -+ */ -+ Boolean updateProviderModuleStatus( -+ const String& providerModuleName, -+ const Array& removeStatus, -+ const Array& appendStatus, -+ Array& outStatus); - - /** - Iterate through registration hash table, if AutoStart property -@@ -477,6 +507,22 @@ - */ - void _setStatus(const Array & status, CIMInstance & moduleInstance); - -+ /** -+ Gets the Provider Module Status. The value of the OperationalStatus -+ property is retrieved from the Provider Module instance in the -+ provider registration table. -+ -+ @param providerModuleName String specifying name of the provider -+ module whose status is to be retrieved -+ -+ @exception CIMException(CIM_ERR_FAILED) if the specified provider -+ module is not found. -+ -+ @return Array of Uint16 containing the OperationalStatus property -+ value -+ */ -+ Array _getProviderModuleStatus( -+ const String& providerModuleName); - }; - - class PEGASUS_PRM_LINKAGE WildCardNamespaceNames { ---- pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt.obz5051 2006-05-31 11:42:03.000000000 -0400 -+++ pegasus/src/Pegasus/msg/Server/pegasusServer_en.txt 2006-05-31 12:18:40.000000000 -0400 -@@ -1275,6 +1275,28 @@ - - ProviderManager.ProviderManagerService.DISABLE_PROVIDER_FAILED:string {"PGS04006: Failed to disable the provider."} - -+ /** -+ * @note PGS04007 -+ * Substitution {0} is the name of a provider module (a string) -+ * Substitution {1} is the name of a system user (a string) -+ * @version 2.6 -+ */ -+ ProviderManager.ProviderManagerService.OOP_PROVIDER_MODULE_USER_CTXT_FAILURE_DETECTED:string {"PGS04007: A failure was detected in provider module {0} with user context {1}."} -+ -+ /** -+ * @note PGS04008 -+ * Substitution {0} is the name of a provider module (a string) -+ * @version 2.6 -+ */ -+ ProviderManager.ProviderManagerService.OOP_PROVIDER_MODULE_FAILURE_DETECTED:string {"PGS04008: A failure was detected in provider module {0}."} -+ -+ /** -+ * @note PGS04009 -+ * Substitution {0} is the name of a provider module (a string) -+ * @version 2.6 -+ */ -+ ProviderManager.ProviderManagerService.OOP_PROVIDER_MODULE_SUBSCRIPTIONS_AFFECTED:string {"PGS04009: The generation of indications by providers in module {0} may be affected. To ensure these providers are serving active subscriptions, disable and then re-enable this module using the cimprovider command."} -+ - - // ========================================================== - // Messages for ProviderModule -@@ -4394,6 +4416,7 @@ - /** - * @note PGS13606 - * Substitution {0} is a string ID for a provider module name -+ * This message is no longer used as of version 2.6.0 - * @version 2.5.1 - */ - ProviderManager.OOPProviderManagerRouter.OOP_PROVIDER_MODULE_FAILURE_DETECTED:string {"PGS13606: A failure was detected in provider module {0}. The generation of indications by providers in this module may be affected. To ensure these providers are serving active subscriptions, disable and then re-enable this module using the cimprovider command."} ---- pegasus/src/Pegasus/Common/Message.cpp.obz5051 2006-01-30 11:17:05.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Message.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -214,6 +214,9 @@ - "CIM_NOTIFY_PROVIDER_ENABLE_REQUEST_MESSAGE", - "CIM_NOTIFY_PROVIDER_ENABLE_RESPONSE_MESSAGE", - -+ "CIM_NOTIFY_PROVIDER_FAIL_REQUEST_MESSAGE", -+ "CIM_NOTIFY_PROVIDER_FAIL_RESPONSE_MESSAGE", -+ - "CIM_INITIALIZE_PROVIDER_REQUEST_MESSAGE", - "CIM_INITIALIZE_PROVIDER_RESPONSE_MESSAGE", - ---- pegasus/src/Pegasus/Common/Constants.h.obz5051 2006-01-30 11:16:48.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Constants.h 2006-05-31 12:18:40.000000000 -0400 -@@ -464,6 +464,7 @@ - - // Constants defining the operational status of a CIM_ManagedSystemElement - #define CIM_MSE_OPSTATUS_VALUE_OK 2 -+#define CIM_MSE_OPSTATUS_VALUE_DEGRADED 3 - #define CIM_MSE_OPSTATUS_VALUE_STOPPING 9 - #define CIM_MSE_OPSTATUS_VALUE_STOPPED 10 - -@@ -472,6 +473,7 @@ - #define PG_PROVMODULE_USERCTXT_DESIGNATED 3 - #define PG_PROVMODULE_USERCTXT_PRIVILEGED 4 - #define PG_PROVMODULE_USERCTXT_CIMSERVER 5 -+#define PEGASUS_DEFAULT_PROV_USERCTXT PG_PROVMODULE_USERCTXT_PRIVILEGED - - // Standard Pegasus Global Prefix. - // This prefix is used as the basis for pegasus defined classes ---- pegasus/src/Pegasus/Common/CIMMessageDeserializer.cpp.obz5051 2006-03-03 15:21:57.000000000 -0500 -+++ pegasus/src/Pegasus/Common/CIMMessageDeserializer.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -298,6 +298,10 @@ - break; - case CIM_INITIALIZE_PROVIDER_REQUEST_MESSAGE: - message = _deserializeCIMInitializeProviderRequestMessage(parser); -+ //case CIM_NOTIFY_PROVIDER_FAIL_REQUEST_MESSAGE: -+ // ATTN: No need to deserialize this yet -+ //message = _deserializeCIMNotifyProviderFailRequestMessage(parser); -+ //break; - break; - case CIM_INITIALIZE_PROVIDER_AGENT_REQUEST_MESSAGE: - message = -@@ -456,6 +460,10 @@ - break; - case CIM_INITIALIZE_PROVIDER_RESPONSE_MESSAGE: - message = _deserializeCIMInitializeProviderResponseMessage(parser); -+ //case CIM_NOTIFY_PROVIDER_FAIL_RESPONSE_MESSAGE: -+ // ATTN: No need to deserialize this yet -+ //message = _deserializeCIMNotifyProviderFailResponseMessage(parser); -+ //break; - break; - case CIM_INITIALIZE_PROVIDER_AGENT_RESPONSE_MESSAGE: - message = ---- pegasus/src/Pegasus/Common/CIMMessageSerializer.cpp.obz5051 2006-02-28 14:53:29.000000000 -0500 -+++ pegasus/src/Pegasus/Common/CIMMessageSerializer.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -280,6 +280,11 @@ - // out, (CIMNotifyProviderEnableRequestMessage*)cimMessage); - break; - case CIM_STOP_ALL_PROVIDERS_REQUEST_MESSAGE: -+ //case CIM_NOTIFY_PROVIDER_FAIL_REQUEST_MESSAGE: -+ // ATTN: No need to serialize this yet -+ //_serializeCIMNotifyProviderFailRequestMessage( -+ // out, (CIMNotifyProviderFailRequestMessage*)cimMessage); -+ //break; - _serializeCIMStopAllProvidersRequestMessage( - out, (CIMStopAllProvidersRequestMessage*)cimMessage); - break; -@@ -469,6 +474,11 @@ - // out, (CIMNotifyProviderEnableResponseMessage*)cimMessage); - break; - case CIM_STOP_ALL_PROVIDERS_RESPONSE_MESSAGE: -+ //case CIM_NOTIFY_PROVIDER_FAIL_RESPONSE_MESSAGE: -+ // ATTN: No need to serialize this yet -+ //_serializeCIMNotifyProviderFailResponseMessage( -+ // out, (CIMNotifyProviderFailResponseMessage*)cimMessage); -+ //break; - _serializeCIMStopAllProvidersResponseMessage( - out, (CIMStopAllProvidersResponseMessage*)cimMessage); - break; ---- pegasus/src/Pegasus/Common/Message.h.obz5051 2006-01-30 11:17:05.000000000 -0500 -+++ pegasus/src/Pegasus/Common/Message.h 2006-05-31 12:18:40.000000000 -0400 -@@ -521,6 +521,9 @@ - CIM_NOTIFY_PROVIDER_ENABLE_REQUEST_MESSAGE, - CIM_NOTIFY_PROVIDER_ENABLE_RESPONSE_MESSAGE, - -+ CIM_NOTIFY_PROVIDER_FAIL_REQUEST_MESSAGE, -+ CIM_NOTIFY_PROVIDER_FAIL_RESPONSE_MESSAGE, -+ - CIM_INITIALIZE_PROVIDER_REQUEST_MESSAGE, - CIM_INITIALIZE_PROVIDER_RESPONSE_MESSAGE, - ---- pegasus/src/Pegasus/Common/CIMMessage.cpp.obz5051 2006-02-28 14:53:29.000000000 -0500 -+++ pegasus/src/Pegasus/Common/CIMMessage.cpp 2006-05-31 12:18:40.000000000 -0400 -@@ -473,6 +473,17 @@ - return response.release(); - } - -+CIMResponseMessage* CIMNotifyProviderFailRequestMessage::buildResponse() const -+{ -+ AutoPtr response( -+ new CIMNotifyProviderFailResponseMessage( -+ messageId, -+ CIMException(), -+ queueIds.copyAndPop())); -+ response->syncAttributes(this); -+ return response.release(); -+} -+ - CIMResponseMessage* CIMStopAllProvidersRequestMessage::buildResponse() - { - AutoPtr response( ---- pegasus/src/Pegasus/Common/CIMMessage.h.obz5051 2006-02-28 14:53:29.000000000 -0500 -+++ pegasus/src/Pegasus/Common/CIMMessage.h 2006-05-31 12:18:40.000000000 -0400 -@@ -1373,6 +1373,30 @@ - Array capInstances; - }; - -+class PEGASUS_COMMON_LINKAGE CIMNotifyProviderFailRequestMessage -+ : public CIMRequestMessage -+{ -+public: -+ CIMNotifyProviderFailRequestMessage( -+ const String & messageId_, -+ const String & moduleName_, -+ const String & userName_, -+ const QueueIdStack& queueIds_) -+ : CIMRequestMessage( -+ CIM_NOTIFY_PROVIDER_FAIL_REQUEST_MESSAGE, -+ messageId_, -+ queueIds_), -+ moduleName(moduleName_), -+ userName(userName_) -+ { -+ } -+ -+ virtual CIMResponseMessage* buildResponse() const; -+ -+ String moduleName; -+ String userName; -+}; -+ - class PEGASUS_COMMON_LINKAGE CIMStopAllProvidersRequestMessage - : public CIMRequestMessage - { -@@ -2067,6 +2091,22 @@ - } - }; - -+class PEGASUS_COMMON_LINKAGE CIMNotifyProviderFailResponseMessage -+ : public CIMResponseMessage -+{ -+public: -+ CIMNotifyProviderFailResponseMessage( -+ const String& messageId_, -+ const CIMException& cimException_, -+ const QueueIdStack& queueIds_) -+ : CIMResponseMessage(CIM_NOTIFY_PROVIDER_FAIL_RESPONSE_MESSAGE, -+ messageId_, cimException_, queueIds_) -+ { -+ } -+ -+ Uint32 numSubscriptionsAffected; -+}; -+ - class PEGASUS_COMMON_LINKAGE CIMStopAllProvidersResponseMessage - : public CIMResponseMessage - { ---- pegasus/src/Providers/TestProviders/Makefile.obz5051 2006-02-07 14:02:01.000000000 -0500 -+++ pegasus/src/Providers/TestProviders/Makefile 2006-05-31 12:18:40.000000000 -0400 -@@ -51,6 +51,8 @@ - MethodTestProvider \ - MethodTestProvider/testclient \ - MCCA_TestAssocProvider \ -+ OOPModuleFailureProvider \ -+ OOPModuleFailureProvider/testclient \ - PG_TestPropertyTypes \ - ProcessIndicationProvider \ - UserContextTestProvider \ ---- pegasus/src/Providers/TestProviders/Load/Makefile.obz5051 2006-03-07 13:22:31.000000000 -0500 -+++ pegasus/src/Providers/TestProviders/Load/Makefile 2006-05-31 12:18:40.000000000 -0400 -@@ -128,6 +128,8 @@ - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextCIMServerR.mof - endif - endif -+ @ $(ECHO) +++++ Loading OOPModuleFailureTestProvider class definitions into $(TESTPROVIDERNS) namespace ... -+ @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" FailureTestIndication.mof - - ## - ## Load the test MOF with cimmof. (Do not remove the existing repository.) -@@ -192,6 +194,8 @@ - @ cimmof "-n$(INTEROPNS)" UserContextCIMServerR.mof - endif - endif -+ @ $(ECHO) +++++ Loading OOPModuleFailureTestProvider class definitions into $(TESTPROVIDERNS) namespace ... -+ @ cimmof "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" FailureTestIndication.mof - - ## - ## diff --git a/pegasus-2.5.1-obz5053.patch b/pegasus-2.5.1-obz5053.patch deleted file mode 100644 index 6b2523b..0000000 --- a/pegasus-2.5.1-obz5053.patch +++ /dev/null @@ -1,240 +0,0 @@ ---- 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 arr(0xffff0000); - } -- catch (const NullPointer&) -+ catch (const PEGASUS_STD(bad_alloc)&) - { - exceptionCaught = true; - } -@@ -201,7 +201,7 @@ - { - Array arr(0xffff0000, 100); - } -- catch (const NullPointer&) -+ catch (const PEGASUS_STD(bad_alloc)&) - { - exceptionCaught = true; - } -@@ -214,7 +214,7 @@ - Uint32 myInt = 50; - Array arr(&myInt, 0xffff0000); - } -- catch (const NullPointer&) -+ catch (const PEGASUS_STD(bad_alloc)&) - { - exceptionCaught = true; - } -@@ -224,7 +224,16 @@ - { - Array 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))/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::alloc(size); - -- if (!_rep) -- { -- throw NullPointer(); -- } -+ // ArrayRep::alloc() throws a bad_alloc exception if -+ // storage could not be obtained. - - InitializeRaw(Array_data, size); - } -@@ -92,10 +90,8 @@ - { - _rep = ArrayRep::alloc(size); - -- if (!_rep) -- { -- throw NullPointer(); -- } -+ // ArrayRep::alloc() throws a bad_alloc exception if -+ // storage could not be obtained. - - PEGASUS_ARRAY_T* data = Array_data; - -@@ -114,10 +110,8 @@ - { - _rep = ArrayRep::alloc(size); - -- if (!_rep) -- { -- throw NullPointer(); -- } -+ // ArrayRep::alloc() throws a bad_alloc exception if -+ // storage could not be obtained. - - CopyToRaw(Array_data, items, size); - } -@@ -176,8 +170,8 @@ - ArrayRep* rep = - ArrayRep::alloc(capacity); - -- if (!rep) -- return; -+ // ArrayRep::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 - #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 - diff --git a/pegasus-2.5.1-obz5059.patch b/pegasus-2.5.1-obz5059.patch deleted file mode 100644 index cc658b8..0000000 --- a/pegasus-2.5.1-obz5059.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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, - }; diff --git a/pegasus-2.5.1-obz5072.patch b/pegasus-2.5.1-obz5072.patch deleted file mode 100644 index 067ec17..0000000 --- a/pegasus-2.5.1-obz5072.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- 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( diff --git a/pegasus-2.5.1-obz5073.patch b/pegasus-2.5.1-obz5073.patch deleted file mode 100644 index 2514451..0000000 --- a/pegasus-2.5.1-obz5073.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- pegasus/src/Pegasus/Repository/AssocClassTable.cpp.obz5073 2006-01-30 11:18:20.000000000 -0500 -+++ pegasus/src/Pegasus/Repository/AssocClassTable.cpp 2006-06-12 13:13:18.000000000 -0400 -@@ -218,10 +218,6 @@ - fields.append(toClassName.getString()); - fields.append(toPropertyName.getString()); - -- for (Uint16 x=0; xaddRecord(fields[FROM_CLASS_NAME_INDEX], - fields); - } -@@ -483,7 +470,6 @@ - for (Uint16 idx=0; idx < classList.size(); idx++) - { - String fromClassName = classList[idx].getString(); -- fromClassName.toLower(); - if (cache->getAssocClassEntry(fromClassName, records)) - { - for (Uint16 rx=0; rx >& entryList); - - /** Add a new entry to the association cache. - */ -- Boolean addRecord(const String& lowerCaseFromClassName, -+ Boolean addRecord(const String& fromClassName, - Array assocClassEntry); - - /** Remove an entry from the association cache specified by the given - * association class name. - */ -- Boolean removeEntry(const String& lowerCaseFromClassName); -+ Boolean removeEntry(const String& fromClassName); - - /** Remove an association record from the association cache specified by the given - * from class name and association name. - */ -- Boolean removeRecord(const String& lowerCaseFromClassName, -- const String& lowerCaseAssocClassName); -+ Boolean removeRecord(const String& fromClassName, -+ const String& assocClassName); - - /** Check if the cache is loaded with objects already. - */ ---- pegasus/src/Pegasus/Repository/AssocClassCache.cpp.obz5073 2006-01-30 11:18:20.000000000 -0500 -+++ pegasus/src/Pegasus/Repository/AssocClassCache.cpp 2006-06-12 13:13:18.000000000 -0400 -@@ -86,9 +86,12 @@ - /** Retrieve the list of entries for a from class through direct - * access via the from class name. - */ --Boolean AssocClassCache::getAssocClassEntry(const String& lowerCaseFromClassName, -+Boolean AssocClassCache::getAssocClassEntry(const String& fromClassName, - Array< Array >& entryList) - { -+ String lowerCaseFromClassName = fromClassName; -+ lowerCaseFromClassName.toLower(); -+ - return _assocClassCache->lookup(lowerCaseFromClassName,entryList); - } - -@@ -97,10 +100,12 @@ - * the new entry is appended to the old entry. Otherwise a new entry - * is added to the cache. - */ --Boolean AssocClassCache::addRecord(const String& lowerCaseFromClassName, -+Boolean AssocClassCache::addRecord(const String& fromClassName, - Array assocClassRecord) - { - Array< Array > oldAssocClassEntryList; -+ String lowerCaseFromClassName = fromClassName; -+ lowerCaseFromClassName.toLower(); - - if (_assocClassCache->lookup(lowerCaseFromClassName, oldAssocClassEntryList)) - { -@@ -115,18 +120,24 @@ - /** Remove an entry from the association cache specified by the given - * from class name. - */ --Boolean AssocClassCache::removeEntry(const String& lowerCaseFromClassName) -+Boolean AssocClassCache::removeEntry(const String& fromClassName) - { -+ String lowerCaseFromClassName = fromClassName; -+ lowerCaseFromClassName.toLower(); -+ - return _assocClassCache->remove(lowerCaseFromClassName); - } - - /** Remove an association record from the association cache specified by the given - * from class name and association name. - */ --Boolean AssocClassCache::removeRecord(const String& lowerCaseFromClassName, -- const String& lowerCaseAssocClassName) -+Boolean AssocClassCache::removeRecord(const String& fromClassName, -+ const String& assocClassName) - { - Array< Array > oldAssocClassEntryList; -+ String lowerCaseFromClassName = fromClassName; -+ lowerCaseFromClassName.toLower(); -+ - if (_assocClassCache->lookup(lowerCaseFromClassName, oldAssocClassEntryList)) - { - for (Uint16 idx=0; idx < oldAssocClassEntryList.size(); idx++ ) -@@ -134,7 +145,8 @@ - // The first entry in each record is the association class - // name. Find the record for the association class and remove - // it from the cache entry. -- if (oldAssocClassEntryList[idx][ASSOC_CLASS_NAME_INDEX] == lowerCaseAssocClassName) -+ if (String::equalNoCase(oldAssocClassEntryList[idx][ASSOC_CLASS_NAME_INDEX], -+ assocClassName)) - { - _assocClassCache->remove(lowerCaseFromClassName); - if (oldAssocClassEntryList.size() > 1) diff --git a/pegasus-2.5.1-obz5083.patch b/pegasus-2.5.1-obz5083.patch deleted file mode 100644 index db966a1..0000000 --- a/pegasus-2.5.1-obz5083.patch +++ /dev/null @@ -1,751 +0,0 @@ ---- 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 response( - new CIMGetClassResponseMessage( -@@ -68,7 +68,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMGetInstanceRequestMessage::buildResponse() -+CIMResponseMessage* CIMGetInstanceRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMGetInstanceResponseMessage( -@@ -80,7 +80,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMExportIndicationRequestMessage::buildResponse() -+CIMResponseMessage* CIMExportIndicationRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMExportIndicationResponseMessage( -@@ -91,7 +91,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMDeleteClassRequestMessage::buildResponse() -+CIMResponseMessage* CIMDeleteClassRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMDeleteClassResponseMessage( -@@ -102,7 +102,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMDeleteInstanceRequestMessage::buildResponse() -+CIMResponseMessage* CIMDeleteInstanceRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMDeleteInstanceResponseMessage( -@@ -113,7 +113,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMCreateClassRequestMessage::buildResponse() -+CIMResponseMessage* CIMCreateClassRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMCreateClassResponseMessage( -@@ -124,7 +124,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMCreateInstanceRequestMessage::buildResponse() -+CIMResponseMessage* CIMCreateInstanceRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMCreateInstanceResponseMessage( -@@ -136,7 +136,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMModifyClassRequestMessage::buildResponse() -+CIMResponseMessage* CIMModifyClassRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMModifyClassResponseMessage( -@@ -147,7 +147,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMModifyInstanceRequestMessage::buildResponse() -+CIMResponseMessage* CIMModifyInstanceRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMModifyInstanceResponseMessage( -@@ -158,7 +158,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMEnumerateClassesRequestMessage::buildResponse() -+CIMResponseMessage* CIMEnumerateClassesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMEnumerateClassesResponseMessage( -@@ -170,7 +170,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMEnumerateClassNamesRequestMessage::buildResponse() -+CIMResponseMessage* CIMEnumerateClassNamesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMEnumerateClassNamesResponseMessage( -@@ -182,7 +182,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMEnumerateInstancesRequestMessage::buildResponse() -+CIMResponseMessage* CIMEnumerateInstancesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMEnumerateInstancesResponseMessage( -@@ -194,7 +194,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMEnumerateInstanceNamesRequestMessage::buildResponse() -+CIMResponseMessage* CIMEnumerateInstanceNamesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMEnumerateInstanceNamesResponseMessage( -@@ -206,7 +206,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMExecQueryRequestMessage::buildResponse() -+CIMResponseMessage* CIMExecQueryRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMExecQueryResponseMessage( -@@ -218,7 +218,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMAssociatorsRequestMessage::buildResponse() -+CIMResponseMessage* CIMAssociatorsRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMAssociatorsResponseMessage( -@@ -230,7 +230,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMAssociatorNamesRequestMessage::buildResponse() -+CIMResponseMessage* CIMAssociatorNamesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMAssociatorNamesResponseMessage( -@@ -242,7 +242,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMReferencesRequestMessage::buildResponse() -+CIMResponseMessage* CIMReferencesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMReferencesResponseMessage( -@@ -254,7 +254,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMReferenceNamesRequestMessage::buildResponse() -+CIMResponseMessage* CIMReferenceNamesRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMReferenceNamesResponseMessage( -@@ -266,7 +266,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMGetPropertyRequestMessage::buildResponse() -+CIMResponseMessage* CIMGetPropertyRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMGetPropertyResponseMessage( -@@ -278,7 +278,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMSetPropertyRequestMessage::buildResponse() -+CIMResponseMessage* CIMSetPropertyRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMSetPropertyResponseMessage( -@@ -289,7 +289,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMGetQualifierRequestMessage::buildResponse() -+CIMResponseMessage* CIMGetQualifierRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMGetQualifierResponseMessage( -@@ -301,7 +301,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMSetQualifierRequestMessage::buildResponse() -+CIMResponseMessage* CIMSetQualifierRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMSetQualifierResponseMessage( -@@ -312,7 +312,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMDeleteQualifierRequestMessage::buildResponse() -+CIMResponseMessage* CIMDeleteQualifierRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMDeleteQualifierResponseMessage( -@@ -323,7 +323,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMEnumerateQualifiersRequestMessage::buildResponse() -+CIMResponseMessage* CIMEnumerateQualifiersRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMEnumerateQualifiersResponseMessage( -@@ -335,7 +335,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMInvokeMethodRequestMessage::buildResponse() -+CIMResponseMessage* CIMInvokeMethodRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMInvokeMethodResponseMessage( -@@ -349,7 +349,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMProcessIndicationRequestMessage::buildResponse() -+CIMResponseMessage* CIMProcessIndicationRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMProcessIndicationResponseMessage( -@@ -360,7 +360,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMNotifyProviderRegistrationRequestMessage::buildResponse() -+CIMResponseMessage* CIMNotifyProviderRegistrationRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMNotifyProviderRegistrationResponseMessage( -@@ -371,7 +371,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMNotifyProviderTerminationRequestMessage::buildResponse() -+CIMResponseMessage* CIMNotifyProviderTerminationRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMNotifyProviderTerminationResponseMessage( -@@ -382,7 +382,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMHandleIndicationRequestMessage::buildResponse() -+CIMResponseMessage* CIMHandleIndicationRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMHandleIndicationResponseMessage( -@@ -393,7 +393,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMCreateSubscriptionRequestMessage::buildResponse() -+CIMResponseMessage* CIMCreateSubscriptionRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMCreateSubscriptionResponseMessage( -@@ -404,7 +404,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMModifySubscriptionRequestMessage::buildResponse() -+CIMResponseMessage* CIMModifySubscriptionRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMModifySubscriptionResponseMessage( -@@ -415,7 +415,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMDeleteSubscriptionRequestMessage::buildResponse() -+CIMResponseMessage* CIMDeleteSubscriptionRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMDeleteSubscriptionResponseMessage( -@@ -427,7 +427,7 @@ - } - - CIMResponseMessage* -- CIMSubscriptionInitCompleteRequestMessage::buildResponse() -+ CIMSubscriptionInitCompleteRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMSubscriptionInitCompleteResponseMessage( -@@ -438,7 +438,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMDisableModuleRequestMessage::buildResponse() -+CIMResponseMessage* CIMDisableModuleRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMDisableModuleResponseMessage( -@@ -450,7 +450,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMEnableModuleRequestMessage::buildResponse() -+CIMResponseMessage* CIMEnableModuleRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMEnableModuleResponseMessage( -@@ -462,7 +462,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMNotifyProviderEnableRequestMessage::buildResponse() -+CIMResponseMessage* CIMNotifyProviderEnableRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMNotifyProviderEnableResponseMessage( -@@ -484,7 +484,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMStopAllProvidersRequestMessage::buildResponse() -+CIMResponseMessage* CIMStopAllProvidersRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMStopAllProvidersResponseMessage( -@@ -495,7 +495,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMInitializeProviderRequestMessage::buildResponse() -+CIMResponseMessage* CIMInitializeProviderRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMInitializeProviderResponseMessage( -@@ -506,7 +506,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMInitializeProviderAgentRequestMessage::buildResponse() -+CIMResponseMessage* CIMInitializeProviderAgentRequestMessage::buildResponse() const - { - AutoPtr response( - new CIMInitializeProviderAgentResponseMessage( -@@ -517,7 +517,7 @@ - return response.release(); - } - --CIMResponseMessage* CIMNotifyConfigChangeRequestMessage::buildResponse() -+CIMResponseMessage* CIMNotifyConfigChangeRequestMessage::buildResponse() const - { - AutoPtr 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 newNamespaces; -@@ -1115,7 +1115,7 @@ - { - } - -- virtual CIMResponseMessage* buildResponse(); -+ virtual CIMResponseMessage* buildResponse() const; - - Array 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 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 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 > configProperties; -@@ -1482,7 +1482,7 @@ - { - } - -- virtual CIMResponseMessage* buildResponse(); -+ virtual CIMResponseMessage* buildResponse() const; - - String propertyName; - String newPropertyValue; diff --git a/pegasus-2.5.1-obz5090.patch b/pegasus-2.5.1-obz5090.patch deleted file mode 100644 index e5fb224..0000000 --- a/pegasus-2.5.1-obz5090.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp.obz5090 2006-01-30 11:18:04.000000000 -0500 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPIProvider.cpp 2006-07-07 18:20:48.000000000 -0400 -@@ -297,19 +297,6 @@ - */ - void CMPIProvider::_terminate(Boolean terminating) - { -- { -- WriteLock writeLock (broker.rwsemClassCache); -- -- if (broker.clsCache) { -- ClassCache::Iterator i=broker.clsCache->start(); -- for (; i; i++) { -- delete i.value(); -- } -- delete broker.clsCache; -- broker.clsCache=NULL; -- } -- } -- - const OperationContext opc; - CMPIStatus rc={CMPI_RC_OK,NULL}; - CMPI_ContextOnStack eCtx(opc); -@@ -350,8 +337,23 @@ - if (rc.rc==CMPI_RC_ERR_NOT_SUPPORTED) noUnload=true; - if ((rc.rc == CMPI_RC_DO_NOT_UNLOAD) || (rc.rc==CMPI_RC_NEVER_UNLOAD)) noUnload =true; - } -+ - if (noUnload == false) - { -+ // Cleanup the class cache -+ { -+ WriteLock writeLock (broker.rwsemClassCache); -+ -+ if (broker.clsCache) { -+ ClassCache::Iterator i=broker.clsCache->start(); -+ for (; i; i++) { -+ delete i.value(); -+ } -+ delete broker.clsCache; -+ broker.clsCache=NULL; -+ } -+ } -+ - // Check the thread list to make sure the thread has been de-allocated - if (_threadWatchList.size() != 0) - { diff --git a/pegasus-2.5.1-obz5115.patch b/pegasus-2.5.1-obz5115.patch deleted file mode 100644 index 3abbf30..0000000 --- a/pegasus-2.5.1-obz5115.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- pegasus/SetConfig_EnvVar.obz5115 2006-01-30 11:16:16.000000000 -0500 -+++ pegasus/SetConfig_EnvVar 2006-06-07 15:06:18.000000000 -0400 -@@ -1,34 +1,34 @@ - #!/usr/bin/perl --//%2006//////////////////////////////////////////////////////////////////////// --// --// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development --// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. --// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; --// IBM Corp.; EMC Corporation, The Open Group. --// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; --// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. --// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; --// EMC Corporation; VERITAS Software Corporation; The Open Group. --// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; --// EMC Corporation; Symantec 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"), to --// deal in the Software without restriction, including without limitation the --// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or --// sell copies of the Software, and to permit persons to whom the Software is --// furnished to do so, subject to the following conditions: --// --// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN --// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED --// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT --// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR --// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT --// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN --// 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. --// --//================================================================================ -+#//%2006//////////////////////////////////////////////////////////////////////// -+#// -+#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development -+#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. -+#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.; -+#// IBM Corp.; EMC Corporation, The Open Group. -+#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.; -+#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. -+#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+#// EMC Corporation; VERITAS Software Corporation; The Open Group. -+#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.; -+#// EMC Corporation; Symantec 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"), to -+#// deal in the Software without restriction, including without limitation the -+#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+#// sell copies of the Software, and to permit persons to whom the Software is -+#// furnished to do so, subject to the following conditions: -+#// -+#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN -+#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED -+#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -+#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -+#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+#// 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. -+#// -+#//================================================================================ - use strict; - #use warnings; - my $HELP_FILE = "SetConfig_EnvVar.help"; diff --git a/pegasus-2.5.1-obz5119.patch b/pegasus-2.5.1-obz5119.patch deleted file mode 100644 index bd413e3..0000000 --- a/pegasus-2.5.1-obz5119.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp.obz5119 2006-01-30 11:18:00.000000000 -0500 -+++ pegasus/src/Pegasus/Provider/CMPI/CmpiImpl.cpp 2006-06-07 15:13:01.000000000 -0400 -@@ -1197,7 +1197,7 @@ - else - throw CmpiStatus(rc.rc,name->charPtr()); - } -- if (name) *name=*(new CmpiString(s)); -+ if (name) *name= CmpiString(s); - return d; - }; - -@@ -1386,7 +1386,7 @@ - CMPIString *s; - d._data=getEnc()->ft->getKeyAt(getEnc(),(int)pos,&s,&rc); - if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc); -- if (name) *name=*(new CmpiString(s)); -+ if (name) *name= CmpiString(s); - return d; - } - -@@ -1710,7 +1710,7 @@ - else - throw CmpiStatus(rc.rc,name->charPtr()); - } -- if (name) *name=*(new CmpiString(s)); -+ if (name) *name= CmpiString(s); - return d; - } - diff --git a/pegasus-2.5.1-obz5180.patch b/pegasus-2.5.1-obz5180.patch deleted file mode 100644 index 3d153ea..0000000 --- a/pegasus-2.5.1-obz5180.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.obz5180 2006-07-07 18:19:11.000000000 -0400 -+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp 2006-07-07 19:03:51.000000000 -0400 -@@ -421,7 +421,18 @@ - CIMResponseMessage *&response) - { - static const char func[] = "CIMOperationRequestDispatcher::_enqueueResponse"; -- AutoMutex autoMut(_mut); -+ // Obtain the _enqueueResponseMutex mutex for this chunked request. -+ // This mutex is used to serialize chunked responses from all incoming -+ // provider threads. It is imperative that the sequencing done by the -+ // resequenceResponse() method and the writing of the chunked response -+ // to the connection socket (done as a synchronous enqueue at the end -+ // of this method) are atomic to ensure that the chunk that is marked -+ // as isComplete for the overall response is indeed the last chunk -+ // returned to the client. See PEP 140 for details. -+ // This mutex was moved into the OperationAggregate class as part of -+ // bug 4629 because we only need to serialize on a per-request basis. -+ // This prevents serializing independent requests on separate connections. -+ AutoMutex autoMut(poA->_enqueueResponseMutex); - Boolean isComplete = false; - - try -@@ -550,13 +561,6 @@ - CIMException(CIM_ERR_FAILED, String(failMsg)); - } - -- if (isComplete == true) -- { -- // also deletes the copied request attached to it -- delete poA; -- poA = 0; -- } -- - // after sending, the response has been deleted externally - response = 0; - -@@ -1785,6 +1789,12 @@ - // the ENTIRE response to the request. - - isComplete = service->_enqueueResponse(poA, response); -+ if (isComplete) -+ { -+ // also deletes the copied request attached to it -+ delete poA; -+ poA = 0; -+ } - - PEG_METHOD_EXIT(); - } ---- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.h.obz5180 2006-02-10 14:13:47.000000000 -0500 -+++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.h 2006-07-07 19:00:43.000000000 -0400 -@@ -159,6 +159,7 @@ - */ - class PEGASUS_SERVER_LINKAGE OperationAggregate - { -+ friend class CIMOperationRequestDispatcher; - public: - /* Operation Aggregate constructor. Builds an aggregate - object. -@@ -227,6 +228,7 @@ - - Array _responseList; - Mutex _appendResponseMutex; -+ Mutex _enqueueResponseMutex; - CIMRequestMessage* _request; - Uint32 _totalIssued; - Uint32 _magicNumber; diff --git a/pegasus-2.5.1-parallel_make.patch b/pegasus-2.5.1-parallel_make.patch deleted file mode 100644 index 2193018..0000000 --- a/pegasus-2.5.1-parallel_make.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- pegasus/mak/objects-unix.mak.parallel_make 2006-01-30 11:16:23.000000000 -0500 -+++ pegasus/mak/objects-unix.mak 2006-04-10 16:58:30.000000000 -0400 -@@ -50,7 +50,7 @@ - - - ifeq ($(_NO_TMP_O), yes) --$(OBJ_DIR)/%.o: %.cpp $(ERROR) -+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.cpp $(ERROR) - $(CXX) -c -o $@ $(FLAGS) $(EXTRA_CXX_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.cpp - @ $(TOUCH) $@ - @ $(ECHO) -@@ -64,7 +64,7 @@ - endif - - ifeq ($(_NO_TMP_O), yes) --$(OBJ_DIR)/%.o: %.c $(ERROR) -+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.c $(ERROR) - $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.c - @ $(TOUCH) $@ - @ $(ECHO) -@@ -78,7 +78,7 @@ - endif - - ifeq ($(_NO_TMP_O), yes) --$(OBJ_DIR)/%.o: %.s $(ERROR) -+$(OBJ_DIR)/%.o: $(OBJ_DIR)/target %.s $(ERROR) - $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s - @ $(TOUCH) $@ - @ $(ECHO) diff --git a/pegasus-2.5.2-PATH_MAX.patch b/pegasus-2.5.2-PATH_MAX.patch deleted file mode 100644 index e1d6c26..0000000 --- a/pegasus-2.5.2-PATH_MAX.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pegasus/src/Pegasus/Common/System.cpp.PATH_MAX 2006-06-09 13:36:52.000000000 -0400 -+++ pegasus/src/Pegasus/Common/System.cpp 2006-07-27 14:11:16.000000000 -0400 -@@ -185,7 +185,7 @@ - char *System::extract_file_path(const char *fullpath, char *dirname) - { - char *p; -- char buff[4096]; -+ char buff[PATH_MAX]; - if (fullpath == NULL) - { - dirname[0] = '\0'; diff --git a/pegasus-2.5.2-cmpi-provider-lib.patch b/pegasus-2.5.2-cmpi-provider-lib.patch deleted file mode 100644 index 89857de..0000000 --- a/pegasus-2.5.2-cmpi-provider-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h.cmpi-provider-lib 2006-06-13 14:00:13.000000000 -0400 -+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h 2006-07-27 14:01:23.000000000 -0400 -@@ -65,7 +65,7 @@ - {"crlStore", PEGASUS_SSL_SERVER_CRL}, - #endif - {"repositoryDir", PEGASUS_REPOSITORY_DIR}, -- {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":/usr/" PEGASUS_ARCH_LIB "/cmpi"}, -+ {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"}, - #else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */ - {"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"}, - #if !defined(PEGASUS_USE_SYSLOGS) diff --git a/pegasus-2.5.2-local-or-remote-auth.patch b/pegasus-2.5.2-local-or-remote-auth.patch deleted file mode 100644 index c3d67fa..0000000 --- a/pegasus-2.5.2-local-or-remote-auth.patch +++ /dev/null @@ -1,439 +0,0 @@ ---- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth 2006-03-10 18:18:37.000000000 -0500 -+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2006-07-27 14:04:18.000000000 -0400 -@@ -384,6 +384,9 @@ - } - } - -+ // Let Authenticators know whether this user is Local or Remote: -+ httpMessage->authInfo->setRemoteUser( httpMessage->fromRemoteHost ); -+ - // - // Handle authentication: - // ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2006-07-27 14:04:18.000000000 -0400 -@@ -48,6 +48,8 @@ - #include - #endif - -+#include -+ - #if defined (PEGASUS_USE_PAM_STANDALONE_PROC) - #include - #include -@@ -131,7 +133,8 @@ - - Boolean PAMBasicAuthenticator::authenticate( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::authenticate()"); -@@ -139,7 +142,7 @@ - Boolean authenticated; - - #if !defined(PEGASUS_USE_PAM_STANDALONE_PROC) -- authenticated = _authenticateByPAM(userName, password); -+ authenticated = _authenticateByPAM(userName, password, isRemoteUser); - #else - // - // Mutex to Serialize Authentication calls. -@@ -147,8 +150,9 @@ - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "Authentication Mutex lock."); - AutoMutex lock(_authSerializeMutex); -- authenticated = _pamBasicAuthenticatorStandAlone.authenticate( -- userName, password); -+ authenticated = -+ _pamBasicAuthenticatorStandAlone->authenticate(userName, -+ password); - #endif - - PEG_METHOD_EXIT(); -@@ -157,7 +161,8 @@ - - Boolean PAMBasicAuthenticator::_authenticateByPAM( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::_authenticateByPAM()"); -@@ -167,6 +172,7 @@ - pam_handle_t *phandle; - char *name; - APP_DATA mydata; -+ int retcode; - - // - // Store the password for PAM authentication -@@ -180,13 +186,31 @@ - // Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - // "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s", - // (const char *)userName.getCString(), (const char *)password.getCString()); -+ -+ // NOTE: if any pam call should log anything, our syslog socket will be redirected -+ // to the AUTH facility, so we need to redirect it back after each pam call. - - // - //Call pam_start since you need to before making any other PAM calls - // -- if ( ( pam_start(service, -+ -+ if ( (retcode = pam_start(service, - (const char *)userName.getCString(), &pconv, &phandle) ) != PAM_SUCCESS ) - { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_start failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } -+ -+ -+ if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS ) -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } -@@ -194,7 +218,7 @@ - // - //Call pam_authenticate to authenticate the user - // -- if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) -+ if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) - { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "pam_authenticate successful."); -@@ -203,22 +227,40 @@ - //checking for password and account expiration, as well as verifying access - //hour restrictions. - // -- if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) -+ -+ if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) - { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "pam_acct_mgmt successful."); - authenticated = true; -- } -+ }else -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(phandle, retcode)); -+ } -+ }else -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(phandle, retcode)); - } -- - // - //Call pam_end to end our PAM work - // - pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); - -- PEG_METHOD_EXIT(); -+ if ( ! authenticated ) -+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s", -+ isRemoteUser ? "remote" : "local", -+ (const char*)userName.getCString() -+ ); - -+ PEG_METHOD_EXIT(); - return (authenticated); -+ - } - - Boolean PAMBasicAuthenticator::validateUser(const String& userName) -@@ -233,6 +275,7 @@ - pam_handle_t *phandle; - char *name; - APP_DATA mydata; -+ int retcode; - - const char *service = "wbem"; - pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback; -@@ -241,21 +284,43 @@ - // - // Call pam_start since you need to before making any other PAM calls - // -- if ( pam_start(service, -- (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS) -- { -+ if ( (retcode = -+ pam_start(service,(const char *)userName.getCString(), &pconv, &phandle) -+ ) != PAM_SUCCESS -+ ) -+ { -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } - -+ if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS ) -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } - // - // Call pam_acct_mgmt, to check if the user account is valid. This includes - // checking for account expiration, as well as verifying access - // hour restrictions. - // -- if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS ) -- { -+ if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS ) -+ { - authenticated = true; -+ }else -+ { -+ pam_end(phandle, 0); -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ syslog( LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); - } - - // -@@ -263,6 +328,9 @@ - // - pam_end(phandle, 0); - -+ closelog(); -+ openlog("cimserver", LOG_PID, LOG_DAEMON); -+ - #else - // - // Mutex to Serialize Authentication calls. ---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2006-07-27 14:04:18.000000000 -0400 -@@ -67,7 +67,8 @@ - */ - virtual Boolean authenticate( - const String& userName, -- const String& password) = 0; -+ const String& password, -+ Boolean isRemoteUser) = 0; - - /** Construct and return the HTTP Basic authentication challenge header - @return A string containing the authentication challenge header. ---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth 2006-07-11 13:25:28.000000000 -0400 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2006-07-27 14:07:01.000000000 -0400 -@@ -163,7 +163,7 @@ - return false; - } - -- authenticated = _basicAuthenticator->authenticate(userName, password); -+ authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser()); - - if (authenticated) - { ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2006-07-27 14:04:18.000000000 -0400 -@@ -92,7 +92,8 @@ - - Boolean PAMBasicAuthenticator::authenticate( - const String& userName, -- const String& password) -+ const String& password, -+ Boolean isRemoteUser) - { - PEG_METHOD_ENTER(TRC_AUTHENTICATION, - "PAMBasicAuthenticator::authenticate()"); ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth 2006-01-30 11:18:28.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2006-07-27 14:04:18.000000000 -0400 -@@ -73,7 +73,8 @@ - */ - Boolean authenticate( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - /** Verify PAM account management for the requesting user. - @param userName String containing the user name -@@ -102,7 +103,8 @@ - - Boolean _authenticateByPAM( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - void _createPAMStandalone(); - -@@ -158,7 +160,8 @@ - */ - Boolean authenticate( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - /** Verify whether the user is valid. - @param userName String containing the user name -@@ -220,7 +223,8 @@ - - Boolean _authenticateByPAM( - const String& userName, -- const String& password); -+ const String& password, -+ Boolean isRemoteUser); - - #if defined(PEGASUS_USE_PAM_STANDALONE_PROC) - PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone; ---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2006-07-27 14:04:18.000000000 -0400 -@@ -57,7 +57,8 @@ - _privileged(false), - _authType(String::EMPTY), - _authStatus(NEW_REQUEST), -- _exportConnection(false) -+ _exportConnection(false), -+ _remoteUser(true) - { - PEG_METHOD_ENTER( - TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep"); -@@ -180,5 +181,14 @@ - PEG_METHOD_EXIT(); - } - -+void AuthenticationInfoRep::setRemoteUser(Boolean remoteUser) -+{ -+ PEG_METHOD_ENTER(TRC_AUTHENTICATION, -+ "AuthenticationInfoRep::setRemoteUser"); -+ -+ _remoteUser = remoteUser; -+ -+ PEG_METHOD_EXIT(); -+} - - PEGASUS_NAMESPACE_END ---- pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth 2006-01-30 11:17:04.000000000 -0500 -+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2006-07-27 14:04:18.000000000 -0400 -@@ -119,7 +119,8 @@ - queueId(queueId_), - authInfo(0), - acceptLanguagesDecoded(false), -- contentLanguagesDecoded(false) -+ contentLanguagesDecoded(false), -+ fromRemoteHost(true) - { - if (cimException_) - cimException = *cimException_; ---- pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2006-07-27 14:04:18.000000000 -0400 -@@ -331,6 +331,22 @@ - _rep->setClientCertificateChain(clientCertificate); - } - -+ /** Indicate whether the user is Remote -+ */ -+ Boolean isRemoteUser() const -+ { -+ _checkRep(); -+ return _rep->isRemoteUser(); -+ } -+ -+ /** Set the Remote User flag -+ */ -+ void setRemoteUser(Boolean remoteUser) -+ { -+ _checkRep(); -+ _rep->setRemoteUser(remoteUser); -+ } -+ - private: - - AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep) ---- pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth 2006-05-12 14:28:20.000000000 -0400 -+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2006-07-27 14:04:18.000000000 -0400 -@@ -1841,6 +1841,30 @@ - "_requestCount = %d", _requestCount.get()); - message->dest = _outputMessageQueue->getQueueId(); - // SendForget(message); -+ -+ // Allow authenticators to differentiate Remote and Local users: -+ struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ... -+ socklen_t slen1=sizeof(struct sockaddr_in), slen2=sizeof(struct sockaddr_in); -+ uint32_t sock = _socket.get()->getSocket() ; -+ memset(&sin_peer,'\0',slen1); -+ memset(&sin_svr, '\0',slen2); -+ if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 ) -+ ||( ::getsockname( sock, (struct sockaddr*)&sin_svr, &slen2) == 0 ) -+ ) -+ { -+ if( sin_peer.sin_family == AF_INET ) -+ { -+ if( ((ntohl( sin_peer.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) -+ // message was sent FROM localhost interface -+ message->fromRemoteHost = false; -+ } -+ if( sin_svr.sin_family == AF_INET ) -+ { -+ if( ((ntohl( sin_svr.sin_addr.s_addr ) >> 24) & 0xff) == 127 ) -+ // message was sent TO localhost interface -+ message->fromRemoteHost = false; -+ } -+ } - - // - // Set the entry status to BUSY. ---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth 2006-01-30 11:16:46.000000000 -0500 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2006-07-27 14:04:18.000000000 -0400 -@@ -143,6 +143,14 @@ - - void setExportConnection(Boolean exportConnection); - -+ Boolean isRemoteUser() const -+ { -+ return _remoteUser; -+ } -+ -+ void setRemoteUser(Boolean remoteUser); -+ -+ - //PEP187 - Array getClientCertificateChain() - { -@@ -173,7 +181,8 @@ - #endif - - Boolean _exportConnection; -- Array _clientCertificate; -+ Array _clientCertificate; -+ Boolean _remoteUser; - }; - - PEGASUS_NAMESPACE_END ---- pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth 2006-01-30 11:17:04.000000000 -0500 -+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2006-07-27 14:04:18.000000000 -0400 -@@ -80,7 +80,8 @@ - ContentLanguageList contentLanguages; - Boolean acceptLanguagesDecoded; - Boolean contentLanguagesDecoded; -- CIMException cimException; -+ Boolean fromRemoteHost; -+ CIMException cimException; - - void parse( - String& startLine, diff --git a/pegasus-2.6.1-init_script.patch b/pegasus-2.6.1-init_script.patch new file mode 100644 index 0000000..6ced2fe --- /dev/null +++ b/pegasus-2.6.1-init_script.patch @@ -0,0 +1,81 @@ +--- pegasus-2.6.1/rpm/tog-pegasus.rc_old 2007-08-30 09:30:13.000000000 +0200 ++++ pegasus-2.6.1/rpm/tog-pegasus.rc 2007-08-30 10:21:42.000000000 +0200 +@@ -5,17 +5,22 @@ + # processname: cimserver + # pidfile: /var/run/tog-pegasus/cimserver.pid + # ++ ++### BEGIN INIT INFO ++# Provides: lsb-pegasus ++# Required-Start: $syslog $network ++# Should-Start: $time ++# Required-Stop: $syslog ++# Default-Start: 3 5 ++# Default-Stop: 0 1 2 6 ++# Description: init script for Pegasus CIMServer ++### END INIT INFO ++ + CIMSERVER_BIN=/usr/sbin/cimserver + prog=cimserver + LOCKFILE=/var/lock/subsys/tog-pegasus + . /etc/rc.d/init.d/functions + +-if [ ! -x $CIMSERVER_BIN ]; then +- echo -n "tog-pegasus $1: $CIMSERVER_BIN not found or not executable."; +- failure; +- exit 1; +-fi; +- + [ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus; + + PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf} +@@ -26,7 +31,26 @@ + RETVAL=0 + + case "$1" in +- start) ++ start) ++ pid=`pidofproc $CIMSERVER_BIN` ++ RETVAL=$? ++ if [ "$RETVAL" -eq 0 ]; then ++ echo "tog-pegasus $1: $CIMSERVER_BIN is already running"; ++ exit 0; ++ fi; ++ ++ if [ ! -e $CIMSERVER_BIN ]; then ++ echo "tog-pegasus $1: $CIMSERVER_BIN not found"; ++ failure; ++ exit 5; ++ fi; ++ ++ if [ ! -x $CIMSERVER_BIN ]; then ++ echo "tog-pegasus $1: $CIMSERVER_BIN not executable"; ++ failure; ++ exit 4; ++ fi; ++ + if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] || + [ ! -e ${PEGASUS_SSL_KEY_FILE} ] || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then + if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then +@@ -71,10 +95,10 @@ + RETVAL=$? + if [ "$RETVAL" -eq 0 ]; then + echo -n $"CIM server ($pid) is running"; +- success; ++ RETVAL=0 + else + echo -n $"CIM server is not running"; +- failure; ++ RETVAL=3 + fi + echo + ;; +@@ -103,7 +127,7 @@ + ;; + *) + echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}" +- exit 1 ++ RETVAL=3 + esac + + exit $RETVAL diff --git a/pegasus-2.6.0-local-or-remote-auth.patch b/pegasus-2.6.1-local-or-remote-auth.patch similarity index 69% rename from pegasus-2.6.0-local-or-remote-auth.patch rename to pegasus-2.6.1-local-or-remote-auth.patch index 4ed253b..4fdba8e 100644 --- a/pegasus-2.6.0-local-or-remote-auth.patch +++ b/pegasus-2.6.1-local-or-remote-auth.patch @@ -1,7 +1,7 @@ -diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfo.h pegasus/src/Pegasus/Common/AuthenticationInfo.h ---- pegasus.orig/src/Pegasus/Common/AuthenticationInfo.h 2006-11-10 12:14:57.000000000 -0600 -+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2007-02-23 00:34:45.000000000 -0600 -@@ -352,6 +352,22 @@ +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Common/AuthenticationInfo.h pegasus-2.6.1/src/Pegasus/Common/AuthenticationInfo.h +--- pegasus-2.6.1.orig/src/Pegasus/Common/AuthenticationInfo.h 2007-03-23 10:36:53.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Common/AuthenticationInfo.h 2007-08-17 11:18:15.000000000 -0700 +@@ -343,6 +343,22 @@ return _rep->getRemotePrivilegedUserAccessChecked(); } @@ -24,20 +24,20 @@ diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfo.h pegasus/src/Pegas private: AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep) -diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.cpp pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp ---- pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.cpp 2006-11-08 06:41:27.000000000 -0600 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2007-02-23 00:34:45.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Common/AuthenticationInfoRep.cpp pegasus-2.6.1/src/Pegasus/Common/AuthenticationInfoRep.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Common/AuthenticationInfoRep.cpp 2007-03-23 10:36:53.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Common/AuthenticationInfoRep.cpp 2007-08-17 11:26:28.000000000 -0700 @@ -51,7 +51,8 @@ _privileged(false), _authType(String::EMPTY), - _authStatus(NEW_REQUEST), + _connectionAuthenticated(false), - _wasRemotePrivilegedUserAccessChecked(false) + _wasRemotePrivilegedUserAccessChecked(false), -+ _remoteUser(true) ++ _remoteUser(true) { PEG_METHOD_ENTER( TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep"); -@@ -59,6 +60,16 @@ +@@ -59,6 +60,15 @@ PEG_METHOD_EXIT(); } @@ -50,14 +50,13 @@ diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.cpp pegasus/src/ + + PEG_METHOD_EXIT(); +} -+ AuthenticationInfoRep::~AuthenticationInfoRep() { -diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.h pegasus/src/Pegasus/Common/AuthenticationInfoRep.h ---- pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.h 2006-11-10 12:14:57.000000000 -0600 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2007-02-23 00:34:45.000000000 -0600 -@@ -142,6 +142,13 @@ +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Common/AuthenticationInfoRep.h pegasus-2.6.1/src/Pegasus/Common/AuthenticationInfoRep.h +--- pegasus-2.6.1.orig/src/Pegasus/Common/AuthenticationInfoRep.h 2007-03-23 10:36:53.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Common/AuthenticationInfoRep.h 2007-08-17 11:18:15.000000000 -0700 +@@ -136,6 +136,13 @@ void setSecurityAssociation(); #endif @@ -71,7 +70,7 @@ diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.h pegasus/src/Pe //PEP187 Array getClientCertificateChain() { -@@ -186,6 +193,7 @@ +@@ -180,6 +187,7 @@ Boolean _wasRemotePrivilegedUserAccessChecked; Array _clientCertificate; @@ -79,12 +78,12 @@ diff -Nur pegasus.orig/src/Pegasus/Common/AuthenticationInfoRep.h pegasus/src/Pe }; PEGASUS_NAMESPACE_END -diff -Nur pegasus.orig/src/Pegasus/Common/HTTPConnection.cpp pegasus/src/Pegasus/Common/HTTPConnection.cpp ---- pegasus.orig/src/Pegasus/Common/HTTPConnection.cpp 2006-12-01 15:03:27.000000000 -0600 -+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2007-02-23 00:34:45.000000000 -0600 -@@ -2030,6 +2030,30 @@ - message->dest = _outputMessageQueue->getQueueId(); - // SendForget(message); +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Common/HTTPConnection.cpp pegasus-2.6.1/src/Pegasus/Common/HTTPConnection.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Common/HTTPConnection.cpp 2007-08-02 01:08:02.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Common/HTTPConnection.cpp 2007-08-17 11:18:15.000000000 -0700 +@@ -2042,6 +2042,30 @@ + #endif + } + // Allow authenticators to differentiate Remote and Local users: + struct sockaddr_in sin_peer, sin_svr; // don't need to worry about IPv6 yet ... @@ -111,12 +110,12 @@ diff -Nur pegasus.orig/src/Pegasus/Common/HTTPConnection.cpp pegasus/src/Pegasus + } + // - // Set the entry status to BUSY. + // increment request count // -diff -Nur pegasus.orig/src/Pegasus/Common/HTTPMessage.cpp pegasus/src/Pegasus/Common/HTTPMessage.cpp ---- pegasus.orig/src/Pegasus/Common/HTTPMessage.cpp 2006-11-08 16:24:00.000000000 -0600 -+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2007-02-23 00:34:45.000000000 -0600 -@@ -109,7 +109,8 @@ +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Common/HTTPMessage.cpp pegasus-2.6.1/src/Pegasus/Common/HTTPMessage.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Common/HTTPMessage.cpp 2007-05-25 10:39:01.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Common/HTTPMessage.cpp 2007-08-17 11:18:15.000000000 -0700 +@@ -120,7 +120,8 @@ queueId(queueId_), authInfo(0), acceptLanguagesDecoded(false), @@ -126,9 +125,9 @@ diff -Nur pegasus.orig/src/Pegasus/Common/HTTPMessage.cpp pegasus/src/Pegasus/Co { if (cimException_) cimException = *cimException_; -diff -Nur pegasus.orig/src/Pegasus/Common/HTTPMessage.h pegasus/src/Pegasus/Common/HTTPMessage.h ---- pegasus.orig/src/Pegasus/Common/HTTPMessage.h 2006-11-10 12:14:58.000000000 -0600 -+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2007-02-23 00:34:45.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Common/HTTPMessage.h pegasus-2.6.1/src/Pegasus/Common/HTTPMessage.h +--- pegasus-2.6.1.orig/src/Pegasus/Common/HTTPMessage.h 2007-05-25 10:39:01.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Common/HTTPMessage.h 2007-08-17 11:18:15.000000000 -0700 @@ -75,6 +75,7 @@ ContentLanguageList contentLanguages; Boolean acceptLanguagesDecoded; @@ -137,9 +136,9 @@ diff -Nur pegasus.orig/src/Pegasus/Common/HTTPMessage.h pegasus/src/Pegasus/Comm CIMException cimException; void parse( -diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp ---- pegasus.orig/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2006-11-08 06:41:28.000000000 -0600 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2007-02-23 00:34:45.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp pegasus-2.6.1/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2006-11-08 04:41:28.000000000 -0800 ++++ pegasus-2.6.1/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2007-08-17 11:18:15.000000000 -0700 @@ -139,7 +139,7 @@ } authInfo->setRemotePrivilegedUserAccessChecked(); @@ -149,9 +148,9 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/BasicAuthenticationHa // Log audit message. PEG_AUDIT_LOG(logBasicAuthentication( -diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/BasicAuthenticator.h pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h ---- pegasus.orig/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2006-01-30 10:18:28.000000000 -0600 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2007-02-23 00:34:45.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/BasicAuthenticator.h pegasus-2.6.1/src/Pegasus/Security/Authentication/BasicAuthenticator.h +--- pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2006-01-30 08:18:28.000000000 -0800 ++++ pegasus-2.6.1/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2007-08-17 11:18:15.000000000 -0700 @@ -67,7 +67,8 @@ */ virtual Boolean authenticate( @@ -162,9 +161,9 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/BasicAuthenticator.h /** Construct and return the HTTP Basic authentication challenge header @return A string containing the authentication challenge header. -diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h ---- pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2006-08-09 16:13:04.000000000 -0500 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2007-02-23 00:36:06.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h pegasus-2.6.1/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h +--- pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2006-08-09 14:13:04.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2007-08-17 11:18:15.000000000 -0700 @@ -73,7 +73,8 @@ */ Boolean authenticate( @@ -205,9 +204,9 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator #if defined(PEGASUS_USE_PAM_STANDALONE_PROC) PAMBasicAuthenticatorStandAlone _pamBasicAuthenticatorStandAlone; -diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp ---- pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2006-01-30 10:18:28.000000000 -0600 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2007-02-23 00:34:45.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp pegasus-2.6.1/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2006-01-30 08:18:28.000000000 -0800 ++++ pegasus-2.6.1/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2007-08-17 11:18:15.000000000 -0700 @@ -92,7 +92,8 @@ Boolean PAMBasicAuthenticator::authenticate( @@ -218,9 +217,9 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator { PEG_METHOD_ENTER(TRC_AUTHENTICATION, "PAMBasicAuthenticator::authenticate()"); -diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp ---- pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2006-11-01 16:42:47.000000000 -0600 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2007-02-23 00:34:45.000000000 -0600 +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp pegasus-2.6.1/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2007-04-04 04:04:52.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2007-08-17 11:38:49.000000000 -0700 @@ -48,6 +48,8 @@ #include #endif @@ -236,7 +235,7 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator const String& userName, - const String& password) + const String& password, -+ Boolean isRemoteUser) ++ Boolean isRemoteUser) { PEG_METHOD_ENTER(TRC_AUTHENTICATION, "PAMBasicAuthenticator::authenticate()"); @@ -249,22 +248,13 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator #else // // Mutex to Serialize Authentication calls. -@@ -146,7 +149,7 @@ - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, - "Authentication Mutex lock."); - AutoMutex lock(_authSerializeMutex); -- authenticated = _pamBasicAuthenticatorStandAlone.authenticate( -+ authenticated = _pamBasicAuthenticatorStandAlone->authenticate( - userName, password); - #endif - @@ -156,7 +159,8 @@ Boolean PAMBasicAuthenticator::_authenticateByPAM( const String& userName, - const String& password) + const String& password, -+ Boolean isRemoteUser) ++ Boolean isRemoteUser) { PEG_METHOD_ENTER(TRC_AUTHENTICATION, "PAMBasicAuthenticator::_authenticateByPAM()"); @@ -278,7 +268,7 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator // Store the password for PAM authentication @@ -180,12 +185,28 @@ // "PAMBasicAuthenticator::_authenticateByPAM() - userName = %s; userPassword = %s", - // (const char *)userName.getCString(), (const char *)password.getCString()); + // (const char *)userName.getCString(), (const char *)password.getCString())); + // NOTE: if any pam call should log anything, our syslog socket will be redirected + // to the AUTH facility, so we need to redirect it back after each pam call. @@ -299,7 +289,7 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator + + if ( (retcode = pam_set_item(phandle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS ) + { -+ pam_end(phandle, 0); ++ pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(phandle, retcode)); @@ -313,7 +303,7 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator - if ( ( pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) + if ( ( retcode = pam_authenticate(phandle, 0) ) == PAM_SUCCESS ) { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, + PEG_TRACE_CSTRING(TRC_AUTHENTICATION, Tracer::LEVEL4, "pam_authenticate successful."); @@ -202,21 +223,41 @@ //checking for password and account expiration, as well as verifying access @@ -322,7 +312,7 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator - if ( ( pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) + if ( ( retcode = pam_acct_mgmt(phandle, 0) ) == PAM_SUCCESS ) { - Tracer::trace(TRC_AUTHENTICATION, Tracer::LEVEL4, + PEG_TRACE_CSTRING(TRC_AUTHENTICATION, Tracer::LEVEL4, "pam_acct_mgmt successful."); authenticated = true; } @@ -366,7 +356,7 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator const char *service = "wbem"; pconv.conv = PAMBasicAuthenticator::pamValidateUserCallback; -@@ -240,28 +282,53 @@ +@@ -240,9 +282,22 @@ // // Call pam_start since you need to before making any other PAM calls // @@ -374,31 +364,29 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator - (const char *)userName.getCString(), &pconv, &phandle) != PAM_SUCCESS) + if ( (retcode = pam_start(service, + (const char *)userName.getCString(), &pconv, &phandle)) != PAM_SUCCESS) - { ++ { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, retcode)); - PEG_METHOD_EXIT(); - return (authenticated); - } - ++ PEG_METHOD_EXIT(); ++ return (authenticated); ++ } ++ + if ( (retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS ) -+ { + { + pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog( LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, retcode)); -+ PEG_METHOD_EXIT(); -+ return (authenticated); -+ } -+ - // - // Call pam_acct_mgmt, to check if the user account is valid. This includes + PEG_METHOD_EXIT(); + return (authenticated); + } +@@ -252,16 +307,28 @@ // checking for account expiration, as well as verifying access // hour restrictions. // - if ( pam_acct_mgmt(phandle, 0) == PAM_SUCCESS ) -+ if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS ) ++ if ( (retcode = pam_acct_mgmt(phandle, 0)) == PAM_SUCCESS ) { authenticated = true; } @@ -423,10 +411,10 @@ diff -Nur pegasus.orig/src/Pegasus/Security/Authentication/PAMBasicAuthenticator #else // // Mutex to Serialize Authentication calls. -diff -Nur pegasus.orig/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp ---- pegasus.orig/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2006-11-14 12:34:59.000000000 -0600 -+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2007-02-23 00:34:45.000000000 -0600 -@@ -281,6 +281,9 @@ +diff -Nur pegasus-2.6.1.orig/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp pegasus-2.6.1/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp +--- pegasus-2.6.1.orig/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2007-04-04 04:04:52.000000000 -0700 ++++ pegasus-2.6.1/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2007-08-17 11:18:15.000000000 -0700 +@@ -274,6 +274,9 @@ } } diff --git a/sources b/sources index f9384b6..d1ff083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -396243b5781eae66c8a8b187b7f85141 pegasus-2.6.0.tar.gz +fa4c1f760482e7222f4a8790185c09dc pegasus-2.6.1.tar.gz diff --git a/tog-pegasus.spec b/tog-pegasus.spec index f111781..24f872a 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -26,7 +26,7 @@ %if %{NODEBUGINFO} %define debug_package %{nil} %endif -%define srcname pegasus +%define srcname pegasus-2.6.1 %define pegasus_gid 65 %define pegasus_uid 66 @@ -40,8 +40,8 @@ %endif %endif -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Epoch: 2 # Summary: OpenPegasus WBEM Services for Linux @@ -53,7 +53,7 @@ License: Open Group Pegasus Open Source # BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}-%(%{__id} -u -n) # -Source: http://www.openpegasus.org/uploads/40/10123/%{srcname}-%{version}.tar.gz +Source: http://www.openpegasus.org/uploads/40/10123/pegasus-%{version}.tar.gz Source1: README.RedHat.Security Source2: genOpenPegasusSSLCerts Source3: pegasus_arch_alternatives @@ -70,13 +70,14 @@ Patch5: pegasus-2.5.1-redhat-config.patch # 6: don't see how http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5099 fixed it Patch6: pegasus-2.6.0-cmpi-provider-lib.patch # 7: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5010 -Patch7: pegasus-2.6.0-local-or-remote-auth.patch +Patch7: pegasus-2.6.1-local-or-remote-auth.patch # 8: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5012 Patch8: pegasus-2.5.1-pam-wbem.patch # 11: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5006 Patch11: pegasus-2.5.1-fix_tests.patch # Patch39: pegasus-2.6.0-cimuser.patch +Patch40: pegasus-2.6.1-init_script.patch # Conflicts: openwbem Provides: tog-pegasus-cimserver @@ -138,6 +139,7 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. %patch8 -p1 -b .pam-wbem %patch11 -p1 -b .fix-tests %patch39 -p1 -b .cimuser +%patch40 -p1 -b .init_script find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:; %build @@ -422,6 +424,10 @@ fi %changelog +* Thu Aug 30 2007 Vitezslav Crhonek - 2.6.1-1 +- Update to 2.6.1 +- Fix wrong init script (#245339) + * Wed Mar 28 2007 Vitezslav Crhonek - 2.6.0-2 - Update changelog - Build with Open Pegasus' Makefiles, istall with RedHats (Mark Hamzy)