update to 2.9.0

This commit is contained in:
vcrhonek 2009-06-16 12:09:03 +00:00
parent 8825f3b2c5
commit ef4a8b337d
18 changed files with 548 additions and 651 deletions

View File

@ -9,3 +9,4 @@ pegasus-2.6.0-no-rpath.patch
pegasus-2.7.0.tar.gz pegasus-2.7.0.tar.gz
pegasus-2.7.1.tar.gz pegasus-2.7.1.tar.gz
pegasus-2.7.2.tar.gz pegasus-2.7.2.tar.gz
pegasus-2.9.0.tar.gz

65
README.RedHat.SSL Normal file
View File

@ -0,0 +1,65 @@
Red Hat SSL configuration for tog-pegasus
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The Red Hat tog-pegasus package is built with support for SSL
(the Secure Socket Layer).
Note: the upstream documentation for SSL is located here:
/usr/share/doc/tog-pegasus-%{version}/PegasusSSLGuidelines.htm
However, because the upstream documentation for SSL is not up-to-date
(it was last updated in March, 2006, around the time of the
OpenPegasus-2.5.1 release), nor accurate, we are providing this short
description of how to configure SSL, as well as how it should be used.
Hard-Coded Build-Time Constants:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Here is the list of constants which are hard-coded during build time:
PEGASUS_CONFIG_DIR = /etc/Pegasus
PEGASUS_PEM_DIR = $(PEGASUS_CONFIG_DIR)
(= /etc/Pegasus)
PEGASUS_SSL_KEY_FILE = file.pem
PEGASUS_SSL_KEY_FILE_PATH = $(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE)
(= /etc/Pegasus/file.pem)
o Contains the private key for the CIM Server SSL Certificate.
PEGASUS_SSL_CERT_FILE = server.pem
PEGASUS_SSL_CERT_FILE_PATH = $(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)
(= /etc/Pegasus/server.pem)
o Contains the CIM Server SSL Certificate.
PEGASUS_SSL_TRUSTSTORE = client.pem
PEGASUS_SSL_CLIENT_TRUSTSTORE = $(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_TRUSTSTORE)
(= /etc/Pegasus/client.pem)
PEGASUS_SSL_SERVER_TRUSTSTORE = $(PEGASUS_PEM_DIR)/cimserver_trust
(= /etc/Pegasus/cimserver_trust)
o Specifies the location of the OpenSSL truststore. Consistent with the
OpenSSL implementation, a truststore can be either a file or directory.
If the truststore is a directory, then all certificates within the
directory are considered trusted.
PEGASUS_SSL_SERVER_CRL = $(PEGASUS_PEM_DIR)/crl
(= /etc/Pegasus/crl)
o This is where the CRL (Certificate Revocation List) store resides.
Tips Following Package Installation:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
o CIM Server default SSL certificates are generated when you run the
tog-pegasus daemon (for example, by issuing the command
"service tog-pegasus start") for the first time, which includes the
following files, which are created in /etc/Pegasus: client.pem, file.pem,
server.pem and ssl.cnf.
Important: simply running the "cimserver" binary (/usr/sbin/cimserver)
does NOT create the certificates or abovementioned files.
Note: if you want to use your own certificates, simply overwrite the ones
in /etc/Pegasus.
o to enable/disable HTTPS port 5989 (the official WBEM secure port),
use cimconfig.
o the wbemcli command (from the sblim-wbemcli package)
uses /etc/Pegasus/client.pem by default (see man wbemcli).

View File

@ -82,10 +82,11 @@ R = $(PEGASUS_ROOT)
SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade $(B)/bin/cimsub SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade $(B)/bin/cimsub
UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec
BINARIES=$(SBINS) $(UBINS) BINARIES=$(SBINS) $(UBINS)
PROVIDER_MANAGERS=$(B)/lib/Pegasus/providerManagers/libCMPIProviderManager.so.1
PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1 PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libsnmpIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegpmservice.so.1 LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libsnmpIndicationHandler.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegpmservice.so.1
all: $(BINARIES) $(LIBRARIES) $(PROVIDERS) all: $(BINARIES) $(LIBRARIES) $(PROVIDERS) $(PROVIDER_MANAGERS)
stage_PegasusSystemFiles: stage_PegasusSystemFiles:
$(MAKE) -f Makefile.Release stage_PegasusSystemFiles $(MAKE) -f Makefile.Release stage_PegasusSystemFiles
@ -96,7 +97,7 @@ setup:
$(MAKE) -f Makefile.Release create_ConfigProductDirectoriesInclude $(MAKE) -f Makefile.Release create_ConfigProductDirectoriesInclude
touch setup touch setup
$(BINARIES) $(LIBRARIES) $(PROVIDERS): setup $(BINARIES) $(LIBRARIES) $(PROVIDERS) $(PROVIDER_MANAGERS): setup
$(B)/bin/cimserver: $(B)/lib/libpegclient.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1 $(B)/lib/libpegpmservice.so.1 $(B)/bin/cimserver: $(B)/lib/libpegclient.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1 $(B)/lib/libpegpmservice.so.1
$(MAKE) -C $(R)/src/Server $(MAKE) -C $(R)/src/Server
@ -152,7 +153,7 @@ $(B)/lib/libCIMxmlIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/li
$(B)/lib/libsnmpIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libsnmpIndicationHandler.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpegclient.so.1
$(MAKE) -C $(R)/src/Pegasus/Handler/snmpIndicationHandler $(MAKE) -C $(R)/src/Pegasus/Handler/snmpIndicationHandler
$(B)/lib/libCMPIProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/Pegasus/providerManagers/libCMPIProviderManager.so.1: $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1
$(MAKE) -C $(R)/src/Pegasus/ProviderManager2/CMPI $(MAKE) -C $(R)/src/Pegasus/ProviderManager2/CMPI
$(B)/lib/libCertificateProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libCertificateProvider.so.1: $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegwql.so.1 $(B)/lib/libpegcql.so.1
@ -296,6 +297,7 @@ ROOTDIRS = $(D)/$(etc)/Pegasus \
$(D)/$(var)/lib/Pegasus/log \ $(D)/$(var)/lib/Pegasus/log \
$(D)/$(lib)/Pegasus \ $(D)/$(lib)/Pegasus \
$(D)/$(lib)/Pegasus/providers \ $(D)/$(lib)/Pegasus/providers \
$(D)/$(lib)/Pegasus/providerManagers \
$(D)/$(lib)/cmpi \ $(D)/$(lib)/cmpi \
$(D)/$(share)/Pegasus/scripts $(D)/$(share)/Pegasus/scripts
PEGDIRS = $(D)/$(share)/Pegasus \ PEGDIRS = $(D)/$(share)/Pegasus \
@ -324,7 +326,7 @@ PEGSCHEMA= $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificate20.mof \
$(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificateRevocationList20.mof \ $(R)/Schemas/Pegasus/Internal/VER20/PG_SSLCertificateRevocationList20.mof \
$(R)/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof $(R)/Schemas/Pegasus/InterOp/VER20/PG_Events20.mof
PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA))) PEGMOF=$(addprefix $(D)$(share)/Pegasus/mof/Pegasus/,$(notdir $(CIMSCHEMA)))
LINKED_LIBS=$(D)/$(lib)/libcmpiCppImpl.so.1 $(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libsnmpIndicationHandler.so.1 $(D)/$(lib)/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1 LINKED_LIBS=$(D)/$(lib)/libcmpiCppImpl.so.1 $(D)/$(lib)/libpegclient.so.1 $(D)/$(lib)/libpegcommon.so.1 $(D)/$(lib)/libpegprovider.so.1 $(D)/$(lib)/libDefaultProviderManager.so.1 $(D)/$(lib)/libCIMxmlIndicationHandler.so.1 $(D)/$(lib)/libsnmpIndicationHandler.so.1 $(D)/$(lib)/Pegasus/providerManagers/libCMPIProviderManager.so.1 $(D)/$(lib)/Pegasus/providers/libComputerSystemProvider.so.1 $(D)/$(lib)/Pegasus/providers/libOSProvider.so.1 $(D)/$(lib)/Pegasus/providers/libProcessProvider.so.1
export PEGASUS_STAGING_DIR := $(D) export PEGASUS_STAGING_DIR := $(D)
BSX ?= BSX ?=
@ -354,13 +356,13 @@ $(D)/$(etc)/Pegasus/access.conf: $(R)/rpm/access.conf
$(D)/$(etc)/pam.d/wbem: $(R)/rpm/wbem $(D)/$(etc)/pam.d/wbem: $(R)/rpm/wbem
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@ $(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
$(D)/$(share)/Pegasus/scripts/settogpath: $(R)/installs/scripts/settogpath
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
$(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts: $(R)/rpm/genOpenPegasusSSLCerts $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts: $(R)/rpm/genOpenPegasusSSLCerts
$(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@ $(install) -m 0640 -o $(root_user) -g $(pegasus_user) -p $< $@
config: $(D)/$(etc)/rc.d/init.d/tog-pegasus $(D)/$(etc)/Pegasus/access.conf $(D)/$(etc)/pam.d/wbem $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts $(D)/$(share)/Pegasus/scripts/settogpath config: $(D)/$(etc)/rc.d/init.d/tog-pegasus $(D)/$(etc)/Pegasus/access.conf $(D)/$(etc)/pam.d/wbem $(D)/$(share)/Pegasus/scripts/genOpenPegasusSSLCerts
$(D)/$(lib)/Pegasus/providerManagers/%:
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providerManagers/%,%,$*) $@
$(D)/$(lib)/Pegasus/providers/%: $(D)/$(lib)/Pegasus/providers/%:
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providers/%,%,$*) $@ $(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$(patsubst Pegasus/providers/%,%,$*) $@
@ -368,7 +370,7 @@ $(D)/$(lib)/Pegasus/providers/%:
$(D)/$(lib)/%: $(D)/$(lib)/%:
$(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$* $@ $(install) -m 0755 -o $(root_user) -g $(pegasus_user) -p $(B)/lib/$* $@
libs: $(LIBRARIES) $(patsubst $(B)/lib/%,$(D)/$(lib)/%,$(LIBRARIES) $(PROVIDERS)) libs: $(LIBRARIES) $(patsubst $(B)/lib/%,$(D)/$(lib)/%,$(LIBRARIES) $(PROVIDERS) $(PROVIDER_MANAGERS))
$(patsubst %.so.1,%.so,$(LINKED_LIBS)): $(patsubst %.so.1,%.so,$(LINKED_LIBS)):
/bin/ln -sf $(patsubst %,%.1,$(notdir $@)) $(patsubst %.so.1,%.so,$@) /bin/ln -sf $(patsubst %,%.1,$(notdir $@)) $(patsubst %.so.1,%.so,$@)
@ -398,9 +400,9 @@ mof: $(CIMSCHEMA) $(PEGSCHEMA)
$(install) -m 0644 -o $(root_user) -g $(root_user) -p $(PEGSCHEMA) $(D)/$(share)/Pegasus/mof/Pegasus $(install) -m 0644 -o $(root_user) -g $(root_user) -p $(PEGSCHEMA) $(D)/$(share)/Pegasus/mof/Pegasus
SDK: SDK:
/bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.7/ /bin/mkdir -p $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.9/
$(MAKE) -f $(R)/mak/SDKMakefile stageSDK $(MAKE) -f $(R)/mak/SDKMakefile stageSDK
/bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.7/ /bin/rm -rf $(PEGASUS_STAGING_DIR)/usr/share/doc/tog-pegasus-2.9/
if [ -n "$(BSX)" ]; then mv $(D)/$(share)/Pegasus/samples/mak/config.mak $(D)/$(share)/Pegasus/samples/mak/config.mak$(BSX); /bin/ln -s config.mak$(BSX) $(D)/$(share)/Pegasus/samples/mak/config.mak; fi; if [ -n "$(BSX)" ]; then mv $(D)/$(share)/Pegasus/samples/mak/config.mak $(D)/$(share)/Pegasus/samples/mak/config.mak$(BSX); /bin/ln -s config.mak$(BSX) $(D)/$(share)/Pegasus/samples/mak/config.mak; fi;
touch SDK touch SDK

View File

@ -1,103 +0,0 @@
--- pegasus/mak/SDKMakefile_old 2006-09-28 02:18:17.000000000 +0200
+++ pegasus/mak/SDKMakefile 2007-06-22 11:40:23.000000000 +0200
@@ -283,18 +283,52 @@
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) "endif" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "ifndef PEGASUS_DEST_LIB_DIR" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) " PEGASUS_DEST_LIB_DIR = $(PEGASUS_DEST_LIB_DIR)" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "endif" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "ifndef PEGASUS_PROVIDER_LIB_DIR" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) " PEGASUS_PROVIDER_LIB_DIR = $(PEGASUS_PROVIDER_LIB_DIR)" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
- @$(ECHO) "endif" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'ifndef PEGASUS_DEST_LIB_DIR' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ia64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),i386)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib64' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390x)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib64' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_DEST_LIB_DIR = /usr/lib64' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'ifndef PEGASUS_PROVIDER_LIB_DIR' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ia64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),i386)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390x)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) "ifndef PEGASUS_SAMPLES_DIR" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) " PEGASUS_SAMPLES_DIR = $(PEGASUS_SAMPLES_DIR)" \
@@ -345,12 +379,29 @@
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
createConfigFile:
- @$(ECHO) "ifndef PEGASUS_PLATFORM" \
- > $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
- @$(ECHO) " PEGASUS_PLATFORM = $(PEGASUS_PLATFORM)" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
- @$(ECHO) "endif" \
- >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) 'ifndef PEGASUS_PLATFORM' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ia64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_IA64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),i386)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_IX86_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_PPC_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),ppc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_PPC64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_ZSERIES_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),s390x)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_ZSERIES64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_X86_64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO) "" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(CAT) $(PEGASUS_ROOT)/src/SDK/samples/mak/config.mak \

View File

@ -1,55 +0,0 @@
--- pegasus/src/Pegasus/Provider/CMPI/cmpidt.h_old 2007-11-07 12:30:36.000000000 +0100
+++ pegasus/src/Pegasus/Provider/CMPI/cmpidt.h 2007-11-07 12:32:07.000000000 +0100
@@ -34,6 +34,8 @@
#ifndef _CMPIDT_H_
# define _CMPIDT_H_
+# include <stdio.h>
+
# include "cmpipl.h"
# ifdef __cplusplus
--- pegasus/src/Pegasus/Provider/CMPI/CmpiArgs.h_old 2007-11-07 12:32:25.000000000 +0100
+++ pegasus/src/Pegasus/Provider/CMPI/CmpiArgs.h 2007-11-07 12:33:13.000000000 +0100
@@ -49,7 +49,7 @@
passed to methodInvocation functions.
*/
-class CmpiArgs : public CmpiObject
+class PEGASUS_CMPI_PROVIDER_LINKAGE CmpiArgs : public CmpiObject
{
friend class CmpiBroker;
friend class CmpiMethodMI;
--- pegasus/mak/SDKMakefile_old 2007-11-07 12:33:39.000000000 +0100
+++ pegasus/mak/SDKMakefile 2007-11-07 12:40:52.000000000 +0100
@@ -118,6 +118,30 @@
# CMPI header files
INCLUDE_FILES += \
+ Pegasus/Provider/CMPI/CmpiArgs.h \
+ Pegasus/Provider/CMPI/CmpiArray.h \
+ Pegasus/Provider/CMPI/CmpiAssociationMI.h \
+ Pegasus/Provider/CMPI/CmpiBaseMI.h \
+ Pegasus/Provider/CMPI/CmpiBooleanData.h \
+ Pegasus/Provider/CMPI/CmpiBroker.h \
+ Pegasus/Provider/CMPI/CmpiCharData.h \
+ Pegasus/Provider/CMPI/CmpiContext.h \
+ Pegasus/Provider/CMPI/CmpiData.h \
+ Pegasus/Provider/CMPI/CmpiDateTime.h \
+ Pegasus/Provider/CMPI/CmpiEnumeration.h \
+ Pegasus/Provider/CMPI/CmpiIndicationMI.h \
+ Pegasus/Provider/CMPI/CmpiInstance.h \
+ Pegasus/Provider/CMPI/CmpiInstanceMI.h \
+ Pegasus/Provider/CMPI/CmpiMethodMI.h \
+ Pegasus/Provider/CMPI/CmpiObject.h \
+ Pegasus/Provider/CMPI/CmpiObjectPath.h \
+ Pegasus/Provider/CMPI/CmpiPropertyMI.h \
+ Pegasus/Provider/CMPI/CmpiProviderBase.h \
+ Pegasus/Provider/CMPI/CmpiResult.h \
+ Pegasus/Provider/CMPI/CmpiSelectExp.h \
+ Pegasus/Provider/CMPI/CmpiStatus.h \
+ Pegasus/Provider/CMPI/CmpiString.h \
+ Pegasus/Provider/CMPI/Linkage.h \
Pegasus/Provider/CMPI/cmpift.h \
Pegasus/Provider/CMPI/cmpidt.h \
Pegasus/Provider/CMPI/cmpimacs.h \

View File

@ -1,183 +0,0 @@
--- pegasus/rpm/tog-pegasus.rc_old 2006-01-30 17:16:24.000000000 +0100
+++ pegasus/rpm/tog-pegasus.rc 2007-11-08 10:50:40.000000000 +0100
@@ -1,80 +1,108 @@
-#//%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.
-#//
-#//==============================================================================
-#! /bin/sh
-#//
-#//%/////////////////////////////////////////////////////////////////////////////
+#!/bin/bash
+#
+# chkconfig: - 98 1
+# description: The Open Group Pegasus cimserver initscript
+# processname: cimserver
+# pidfile: /var/run/tog-pegasus/cimserver.pid
+#
### BEGIN INIT INFO
-# Provides: tog-pegasus
+# 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 CIM server
+# Description: init script for Pegasus CIMServer
### END INIT INFO
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+CIMSERVER_BIN=/usr/sbin/cimserver
prog=cimserver
+LOCKFILE=/var/lock/subsys/tog-pegasus
+. /etc/rc.d/init.d/functions
-test -x $CIMSERVER_BIN || exit 5
+[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
+
+PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf}
+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=/etc/Pegasus/server.pem}
+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=/etc/Pegasus/file.pem}
+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=/etc/Pegasus/client.pem}
-. /lib/lsb/init-functions
RETVAL=0
case "$1" in
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
+ echo -n "tog-pegasus: Generating cimserver SSL certificates...";
+ /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts;
+ if [ $? -eq 0 ]; then
+ success;
+ else
+ failure;
+ fi;
+ echo;
+ fi;
+ fi;
echo -n $"Starting up CIM server: "
- $CIMSERVER_BIN
+ $CIMSERVER_BIN ${CIMSERVER_OPTIONS}
RETVAL=$?
- [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
- echo
+ if [ "$RETVAL" -eq 0 ]; then
+ touch $LOCKFILE;
+ success;
+ else
+ failure;
+ fi;
+ echo;
;;
stop)
echo -n $"Shutting down CIM server: "
killproc cimserver
RETVAL=$?
- [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
+ if [ "$RETVAL" -eq 0 ]; then
+ rm -f $LOCKFILE;
+ rm -f /var/run/tog-pegasus/*;
+ success;
+ else
+ failure;
+ fi
echo
;;
+
status)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
if [ "$RETVAL" -eq 0 ]; then
- echo "CIM server is running"
+ echo -n $"CIM server ($pid) is running";
+ RETVAL=0
else
- echo "CIM server is not running"
+ echo -n $"CIM server is not running";
+ RETVAL=3
fi
+ echo
;;
+
condrestart)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
@@ -83,18 +111,23 @@
RETVAL=$?;
fi;
;;
+
try-restart)
- $0 stop && $0 start
+ $0 stop && $0 start;
+ RETVAL=$?;
;;
+
restart|force-reload)
- $0 stop
- $0 start
+ $0 stop;
+ $0 start;
+ RETVAL=$?;
;;
+
reload)
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
- exit 1
+ RETVAL=3
esac
exit $RETVAL

View File

@ -1,67 +0,0 @@
--- pegasus/mak/program-unix.mak_old 2007-08-01 10:16:28.000000000 +0200
+++ pegasus/mak/program-unix.mak 2007-11-07 10:29:36.000000000 +0100
@@ -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)
S_OBJECTS = $(TMP_OBJECTS:.s=.o)
@@ -109,17 +99,17 @@
ifdef ICU_ROOT
ifdef ICU_INSTALL
ifdef PEGASUS_USE_RELEASE_DIRS
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
else
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) $(LINK_RPATH) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_ICU) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
endif
endif
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) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
else
- $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) $(LINK_RPATH) $(LINK_LIB_DIR) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
+ $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXTRA_LINK_FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
endif
endif
else
--- pegasus/mak/shared-library-unix.mak_old 2007-11-07 10:29:56.000000000 +0100
+++ pegasus/mak/shared-library-unix.mak 2007-11-07 10:38:10.000000000 +0100
@@ -107,14 +107,14 @@
ifneq ($(OS),darwin)
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)

View File

@ -1,11 +0,0 @@
--- pegasus/env_var_Linux.status_old 2007-11-12 16:30:16.000000000 +0100
+++ pegasus/env_var_Linux.status 2007-11-12 16:30:58.000000000 +0100
@@ -35,7 +35,7 @@
PEGASUS_USE_SYSLOGS=true
PEGASUS_CIM_SCHEMA=CIM2131
PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
PEGASUS_PROD_DIR = /usr
PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin

View File

@ -1,12 +1,12 @@
diff -Nur pegasus.orig/src/Pegasus/Config/FixedPropertyTableLinux.h pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h diff -up pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h_old pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h
--- pegasus.orig/src/Pegasus/Config/FixedPropertyTableLinux.h 2006-11-14 12:34:50.000000000 -0600 --- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h_old 2008-12-02 10:01:24.000000000 +0100
+++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h 2007-02-22 15:51:33.000000000 -0600 +++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h 2009-03-18 15:35:41.000000000 +0100
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
{"crlStore", PEGASUS_SSL_SERVER_CRL}, {"crlStore", PEGASUS_SSL_SERVER_CRL},
# endif # endif
{"repositoryDir", PEGASUS_REPOSITORY_DIR}, {"repositoryDir", PEGASUS_REPOSITORY_DIR},
- {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":/usr/" PEGASUS_ARCH_LIB "/cmpi"}, - {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":/usr/" PEGASUS_ARCH_LIB "/cmpi"},
+ {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"}, + {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"},
{"providerManagerDir", PEGASUS_PROVIDER_MANAGER_LIB_DIR},
# else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */ # else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
{"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"}, {"traceFilePath", "/var/opt/tog-pegasus/cache/trace/cimserver.trc"},
# if !defined(PEGASUS_USE_SYSLOGS)

View File

@ -1,6 +1,7 @@
--- pegasus/Makefile.ReleaseTest.fix-tests 2006-02-28 17:23:55.000000000 -0500 diff -up pegasus/Makefile.ReleaseTest_old pegasus/Makefile.ReleaseTest
+++ pegasus/Makefile.ReleaseTest 2006-04-10 22:17:27.000000000 -0400 --- pegasus/Makefile.ReleaseTest_old 2008-12-16 19:55:33.000000000 +0100
@@ -165,7 +165,7 @@ +++ pegasus/Makefile.ReleaseTest 2009-06-08 16:13:17.000000000 +0200
@@ -195,7 +195,7 @@ create_Makefile:
createMakefile_providerlinks: createMakefile_providerlinks:
@$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "create_providerlinks:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@ -9,7 +10,7 @@
@$(ECHO-E) "" >> $(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 @$(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 ;) @$(foreach i, $(PEGASUS_TEST_PROVIDERS), $(ECHO-E) "\trm -f $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile ;)
@@ -189,8 +189,10 @@ @@ -238,8 +238,10 @@ createMakefile_tests:
@$(ECHO-E) "tests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "tests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "\t@$(MAKE) -i cimstop" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "\t@$(MAKE) -i cimstop" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "\t@$(MAKE) prestarttests" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "\t@$(MAKE) prestarttests" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@ -21,4 +22,4 @@
+ @$(ECHO-E) "\t@$(MAKE) unsetupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile + @$(ECHO-E) "\t@$(MAKE) unsetupTEST" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
createMakefile_setupTEST: createMakefile_testsWithSetupAndUnsetup:

View File

@ -0,0 +1,184 @@
diff -up pegasus/rpm/tog-pegasus.rc_old pegasus/rpm/tog-pegasus.rc
--- pegasus/rpm/tog-pegasus.rc_old 2008-12-02 10:00:03.000000000 +0100
+++ pegasus/rpm/tog-pegasus.rc 2009-03-18 14:39:40.000000000 +0100
@@ -1,78 +1,108 @@
-#//%LICENSE////////////////////////////////////////////////////////////////
-#//
-#// Licensed to The Open Group (TOG) under one or more contributor license
-#// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
-#// this work for additional information regarding copyright ownership.
-#// Each contributor licenses this file to you under the OpenPegasus Open
-#// Source License; you may not use this file except in compliance with the
-#// License.
-#//
-#// 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.
-#//
-#//////////////////////////////////////////////////////////////////////////
-#! /bin/sh
-#//
-#//%/////////////////////////////////////////////////////////////////////////////
+#!/bin/bash
+#
+# chkconfig: - 98 1
+# description: The Open Group Pegasus cimserver initscript
+# processname: cimserver
+# pidfile: /var/run/tog-pegasus/cimserver.pid
+#
### BEGIN INIT INFO
-# Provides: tog-pegasus
+# 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 CIM server
+# Description: init script for Pegasus CIMServer
### END INIT INFO
-CIMSERVER_BIN=/opt/tog-pegasus/sbin/cimserver
+CIMSERVER_BIN=/usr/sbin/cimserver
prog=cimserver
+LOCKFILE=/var/lock/subsys/tog-pegasus
+. /etc/rc.d/init.d/functions
-test -x $CIMSERVER_BIN || exit 5
+[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
+
+PEGASUS_SSL_CONF_FILE=${PEGASUS_SSL_CONF_FILE:=/etc/Pegasus/ssl.cnf}
+PEGASUS_SSL_CERT_FILE=${PEGASUS_SSL_CERT_FILE:=/etc/Pegasus/server.pem}
+PEGASUS_SSL_KEY_FILE=${PEGASUS_SSL_KEY_FILE:=/etc/Pegasus/file.pem}
+PEGASUS_SSL_TRUSTSTORE=${PEGASUS_SSL_TRUSTSTORE:=/etc/Pegasus/client.pem}
-. /lib/lsb/init-functions
RETVAL=0
case "$1" in
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
+ echo -n "tog-pegasus: Generating cimserver SSL certificates...";
+ /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts;
+ if [ $? -eq 0 ]; then
+ success;
+ else
+ failure;
+ fi;
+ echo;
+ fi;
+ fi;
echo -n $"Starting up CIM server: "
- $CIMSERVER_BIN
+ $CIMSERVER_BIN ${CIMSERVER_OPTIONS}
RETVAL=$?
- [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start"
- echo
+ if [ "$RETVAL" -eq 0 ]; then
+ touch $LOCKFILE;
+ success;
+ else
+ failure;
+ fi;
+ 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
+ if [ "$RETVAL" -eq 0 ]; then
+ rm -f $LOCKFILE;
+ rm -f /var/run/tog-pegasus/*;
+ success;
+ else
+ failure;
+ fi;
+ echo;
;;
+
status)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
if [ "$RETVAL" -eq 0 ]; then
- echo "CIM server is running"
+ echo -n $"CIM server ($pid) is running";
+ RETVAL=0
else
- echo "CIM server is not running"
- fi
+ echo -n $"CIM server is not running";
+ RETVAL=3
+ fi;
+ echo;
;;
+
condrestart)
pid=`pidofproc $CIMSERVER_BIN`
RETVAL=$?
@@ -81,18 +111,23 @@ case "$1" in
RETVAL=$?;
fi;
;;
+
try-restart)
- $0 stop && $0 start
+ $0 stop && $0 start;
+ RETVAL=$?;
;;
+
restart|force-reload)
- $0 stop
- $0 start
+ $0 stop;
+ $0 start;
+ RETVAL=$?;
;;
+
reload)
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|force-reload|try-restart}"
- exit 1
+ RETVAL=3
esac
exit $RETVAL

View File

@ -1,7 +1,7 @@
diff -up pegasus/src/Executor/PAMAuth.h.old pegasus/src/Executor/PAMAuth.h diff -up pegasus/src/Executor/PAMAuth.h.local-or-remote-auth pegasus/src/Executor/PAMAuth.h
--- pegasus/src/Executor/PAMAuth.h.old 2007-07-25 21:43:47.000000000 +0200 --- pegasus/src/Executor/PAMAuth.h.local-or-remote-auth 2008-12-02 10:00:13.000000000 +0100
+++ pegasus/src/Executor/PAMAuth.h 2008-11-11 13:36:19.000000000 +0100 +++ pegasus/src/Executor/PAMAuth.h 2009-06-08 15:06:26.000000000 +0200
@@ -53,6 +53,9 @@ @@ -49,6 +49,9 @@
#include <Executor/Defines.h> #include <Executor/Defines.h>
#include <Executor/Socket.h> #include <Executor/Socket.h>
@ -11,7 +11,7 @@ diff -up pegasus/src/Executor/PAMAuth.h.old pegasus/src/Executor/PAMAuth.h
/* /*
**============================================================================== **==============================================================================
** **
@@ -397,29 +400,60 @@ static int PAMValidateUserCallback( @@ -393,29 +396,60 @@ static int PAMValidateUserCallback(
*/ */
static int PAMAuthenticateInProcess( static int PAMAuthenticateInProcess(
@ -76,7 +76,7 @@ diff -up pegasus/src/Executor/PAMAuth.h.old pegasus/src/Executor/PAMAuth.h
return -1; return -1;
} }
@@ -443,16 +477,34 @@ static int PAMValidateUserInProcess(cons @@ -439,16 +473,34 @@ static int PAMValidateUserInProcess(cons
PAMData data; PAMData data;
struct pam_conv pconv; struct pam_conv pconv;
pam_handle_t* phandle; pam_handle_t* phandle;
@ -113,7 +113,7 @@ diff -up pegasus/src/Executor/PAMAuth.h.old pegasus/src/Executor/PAMAuth.h
return -1; return -1;
} }
@@ -471,12 +523,12 @@ static int PAMValidateUserInProcess(cons @@ -467,12 +519,12 @@ static int PAMValidateUserInProcess(cons
**============================================================================== **==============================================================================
*/ */
@ -128,36 +128,36 @@ diff -up pegasus/src/Executor/PAMAuth.h.old pegasus/src/Executor/PAMAuth.h
#endif #endif
} }
diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.old pegasus/src/Pegasus/Common/AuthenticationInfo.h diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth pegasus/src/Pegasus/Common/AuthenticationInfo.h
--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.old 2007-09-03 13:27:02.000000000 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfo.h.local-or-remote-auth 2008-12-16 19:55:59.000000000 +0100
+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2009-06-08 15:06:26.000000000 +0200
@@ -356,6 +356,22 @@ public: @@ -354,6 +354,22 @@ public:
return _rep->getRemotePrivilegedUserAccessChecked(); return _rep->getRemotePrivilegedUserAccessChecked();
} }
+ /** Indicate whether the user is Remote + /** Indicate whether the user is Remote
+ */ + */
+ Boolean isRemoteUser() const + Boolean isRemoteUser() const
+ { + {
+ CheckRep(_rep); + CheckRep(_rep);
+ return _rep->isRemoteUser(); + return _rep->isRemoteUser();
+ } + }
+ +
+ /** Set the Remote User flag + /** Set the Remote User flag
+ */ + */
+ void setRemoteUser(Boolean isRemoteUser) + void setRemoteUser(Boolean isRemoteUser)
+ { + {
+ CheckRep(_rep); + CheckRep(_rep);
+ _rep->setRemoteUser(isRemoteUser); + _rep->setRemoteUser(isRemoteUser);
+ } + }
+ +
private: private:
AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep) AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(rep)
diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.old pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.old 2007-08-22 09:43:37.000000000 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.local-or-remote-auth 2008-12-16 19:55:59.000000000 +0100
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -46,7 +46,8 @@ const String AuthenticationInfoRep::AUTH @@ -44,7 +44,8 @@ const String AuthenticationInfoRep::AUTH
AuthenticationInfoRep::AuthenticationInfoRep(Boolean flag) AuthenticationInfoRep::AuthenticationInfoRep(Boolean flag)
: _connectionAuthenticated(false), : _connectionAuthenticated(false),
@ -167,11 +167,11 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.old pegasus/src/Pe
{ {
PEG_METHOD_ENTER( PEG_METHOD_ENTER(
TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep"); TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep");
@@ -62,6 +63,16 @@ AuthenticationInfoRep::~AuthenticationIn @@ -60,6 +61,16 @@ AuthenticationInfoRep::~AuthenticationIn
PEG_METHOD_EXIT(); PEG_METHOD_EXIT();
} }
+void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser) +void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser)
+{ +{
+ PEG_METHOD_ENTER(TRC_AUTHENTICATION, + PEG_METHOD_ENTER(TRC_AUTHENTICATION,
+ "AuthenticationInfoRep::setRemoteUser"); + "AuthenticationInfoRep::setRemoteUser");
@ -184,10 +184,10 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.old pegasus/src/Pe
void AuthenticationInfoRep::setConnectionAuthenticated( void AuthenticationInfoRep::setConnectionAuthenticated(
Boolean connectionAuthenticated) Boolean connectionAuthenticated)
{ {
diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.old pegasus/src/Pegasus/Common/AuthenticationInfoRep.h diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth pegasus/src/Pegasus/Common/AuthenticationInfoRep.h
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.old 2007-08-22 09:43:37.000000000 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.local-or-remote-auth 2008-12-16 19:55:59.000000000 +0100
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2009-06-08 15:06:26.000000000 +0200
@@ -149,6 +149,13 @@ public: @@ -147,6 +147,13 @@ public:
void setSecurityAssociation(); void setSecurityAssociation();
#endif #endif
@ -201,7 +201,7 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.old pegasus/src/Pega
Array<SSLCertificateInfo*> getClientCertificateChain() Array<SSLCertificateInfo*> getClientCertificateChain()
{ {
return _clientCertificate; return _clientCertificate;
@@ -192,6 +199,7 @@ private: @@ -190,6 +197,7 @@ private:
Boolean _wasRemotePrivilegedUserAccessChecked; Boolean _wasRemotePrivilegedUserAccessChecked;
Array<SSLCertificateInfo*> _clientCertificate; Array<SSLCertificateInfo*> _clientCertificate;
@ -209,10 +209,10 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.old pegasus/src/Pega
}; };
PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
diff -up pegasus/src/Pegasus/Common/Executor.cpp.old pegasus/src/Pegasus/Common/Executor.cpp diff -up pegasus/src/Pegasus/Common/Executor.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/Executor.cpp
--- pegasus/src/Pegasus/Common/Executor.cpp.old 2008-02-08 20:42:37.000000000 +0100 --- pegasus/src/Pegasus/Common/Executor.cpp.local-or-remote-auth 2008-12-16 19:55:59.000000000 +0100
+++ pegasus/src/Pegasus/Common/Executor.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/Executor.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -122,7 +122,8 @@ public: @@ -125,7 +125,8 @@ public:
virtual int authenticatePassword( virtual int authenticatePassword(
const char* username, const char* username,
@ -222,7 +222,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.old pegasus/src/Pegasus/Common/
virtual int validateUser( virtual int validateUser(
const char* username) = 0; const char* username) = 0;
@@ -470,10 +471,11 @@ public: @@ -555,10 +556,11 @@ public:
virtual int authenticatePassword( virtual int authenticatePassword(
const char* username, const char* username,
@ -236,7 +236,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.old pegasus/src/Pegasus/Common/
#else #else
// ATTN: not handled so don't call in this case. // ATTN: not handled so don't call in this case.
return -1; return -1;
@@ -812,7 +814,8 @@ public: @@ -897,7 +899,8 @@ public:
virtual int authenticatePassword( virtual int authenticatePassword(
const char* username, const char* username,
@ -246,7 +246,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.old pegasus/src/Pegasus/Common/
{ {
AutoMutex autoMutex(_mutex); AutoMutex autoMutex(_mutex);
@@ -1080,10 +1083,11 @@ int Executor::reapProviderAgent( @@ -1165,10 +1168,11 @@ int Executor::reapProviderAgent(
int Executor::authenticatePassword( int Executor::authenticatePassword(
const char* username, const char* username,
@ -260,10 +260,10 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.old pegasus/src/Pegasus/Common/
} }
int Executor::validateUser( int Executor::validateUser(
diff -up pegasus/src/Pegasus/Common/Executor.h.old pegasus/src/Pegasus/Common/Executor.h diff -up pegasus/src/Pegasus/Common/Executor.h.local-or-remote-auth pegasus/src/Pegasus/Common/Executor.h
--- pegasus/src/Pegasus/Common/Executor.h.old 2008-02-08 20:17:58.000000000 +0100 --- pegasus/src/Pegasus/Common/Executor.h.local-or-remote-auth 2008-12-02 10:00:47.000000000 +0100
+++ pegasus/src/Pegasus/Common/Executor.h 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/Executor.h 2009-06-08 15:06:26.000000000 +0200
@@ -185,7 +185,8 @@ public: @@ -183,7 +183,8 @@ public:
*/ */
static int authenticatePassword( static int authenticatePassword(
const char* username, const char* username,
@ -273,10 +273,10 @@ diff -up pegasus/src/Pegasus/Common/Executor.h.old pegasus/src/Pegasus/Common/Ex
/** Check whether the given user is valid for the underlying authentcation /** Check whether the given user is valid for the underlying authentcation
mechanism. mechanism.
diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.old pegasus/src/Pegasus/Common/HTTPConnection.cpp diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/HTTPConnection.cpp
--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.old 2008-01-25 20:03:23.000000000 +0100 --- pegasus/src/Pegasus/Common/HTTPConnection.cpp.local-or-remote-auth 2008-12-18 19:52:01.000000000 +0100
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -2117,6 +2117,30 @@ void HTTPConnection::_handleReadEvent() @@ -2128,6 +2128,30 @@ void HTTPConnection::_handleReadEvent()
message->contentLanguages = contentLanguages; message->contentLanguages = contentLanguages;
message->dest = _outputMessageQueue->getQueueId(); message->dest = _outputMessageQueue->getQueueId();
@ -307,10 +307,10 @@ diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.old pegasus/src/Pegasus/C
// //
// The _closeConnection method sets the _connectionClosePending flag. // The _closeConnection method sets the _connectionClosePending flag.
// If we are executing on the client side and the // If we are executing on the client side and the
diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.old pegasus/src/Pegasus/Common/HTTPMessage.cpp diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/HTTPMessage.cpp
--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.old 2007-08-22 09:43:37.000000000 +0200 --- pegasus/src/Pegasus/Common/HTTPMessage.cpp.local-or-remote-auth 2008-12-18 19:52:01.000000000 +0100
+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -120,7 +120,8 @@ HTTPMessage::HTTPMessage( @@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage(
queueId(queueId_), queueId(queueId_),
authInfo(0), authInfo(0),
acceptLanguagesDecoded(false), acceptLanguagesDecoded(false),
@ -320,10 +320,10 @@ diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.old pegasus/src/Pegasus/Comm
{ {
if (cimException_) if (cimException_)
cimException = *cimException_; cimException = *cimException_;
diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.old pegasus/src/Pegasus/Common/HTTPMessage.h diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth pegasus/src/Pegasus/Common/HTTPMessage.h
--- pegasus/src/Pegasus/Common/HTTPMessage.h.old 2007-08-22 09:43:37.000000000 +0200 --- pegasus/src/Pegasus/Common/HTTPMessage.h.local-or-remote-auth 2008-12-18 19:52:01.000000000 +0100
+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/HTTPMessage.h 2009-06-08 15:06:26.000000000 +0200
@@ -75,6 +75,7 @@ public: @@ -73,6 +73,7 @@ public:
ContentLanguageList contentLanguages; ContentLanguageList contentLanguages;
Boolean acceptLanguagesDecoded; Boolean acceptLanguagesDecoded;
Boolean contentLanguagesDecoded; Boolean contentLanguagesDecoded;
@ -331,10 +331,10 @@ diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.old pegasus/src/Pegasus/Common
CIMException cimException; CIMException cimException;
void parse( void parse(
diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.old pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.local-or-remote-auth pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp
--- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.old 2007-07-25 21:43:49.000000000 +0200 --- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.local-or-remote-auth 2008-12-02 10:01:08.000000000 +0100
+++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -80,7 +80,7 @@ void testExecutorLoopbackImpl() @@ -76,7 +76,7 @@ void testExecutorLoopbackImpl()
#endif #endif
PEGASUS_TEST_ASSERT(Executor::authenticatePassword( PEGASUS_TEST_ASSERT(Executor::authenticatePassword(
@ -343,7 +343,7 @@ diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.old pegasus/
PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1); PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1);
char challengeFilePath[EXECUTOR_BUFFER_SIZE]; char challengeFilePath[EXECUTOR_BUFFER_SIZE];
@@ -119,7 +119,7 @@ void testExecutorSocketImpl() @@ -115,7 +115,7 @@ void testExecutorSocketImpl()
PEGASUS_TEST_ASSERT(Executor::reapProviderAgent(123) == 0); PEGASUS_TEST_ASSERT(Executor::reapProviderAgent(123) == 0);
PEGASUS_TEST_ASSERT(Executor::authenticatePassword( PEGASUS_TEST_ASSERT(Executor::authenticatePassword(
@ -352,9 +352,9 @@ diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.old pegasus/
PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1); PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1);
char challengeFilePath[EXECUTOR_BUFFER_SIZE]; char challengeFilePath[EXECUTOR_BUFFER_SIZE];
diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.old pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.old 2008-03-12 07:28:56.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.local-or-remote-auth 2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2009-06-08 15:22:26.000000000 +0200
@@ -152,7 +152,7 @@ Boolean BasicAuthenticationHandler::auth @@ -152,7 +152,7 @@ Boolean BasicAuthenticationHandler::auth
} }
authInfo->setRemotePrivilegedUserAccessChecked(); authInfo->setRemotePrivilegedUserAccessChecked();
@ -364,10 +364,10 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.
// Log audit message. // Log audit message.
PEG_AUDIT_LOG(logBasicAuthentication( PEG_AUDIT_LOG(logBasicAuthentication(
diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.old pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.old 2006-01-30 17:18:28.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.local-or-remote-auth 2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2009-06-08 15:06:26.000000000 +0200
@@ -67,7 +67,8 @@ public: @@ -65,7 +65,8 @@ public:
*/ */
virtual Boolean authenticate( virtual Boolean authenticate(
const String& userName, const String& userName,
@ -377,10 +377,10 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.old pe
/** Construct and return the HTTP Basic authentication challenge header /** Construct and return the HTTP Basic authentication challenge header
@return A string containing the authentication challenge header. @return A string containing the authentication challenge header.
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.old pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.old 2007-05-25 20:35:18.000000000 +0200 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.local-or-remote-auth 2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2009-06-08 15:06:26.000000000 +0200
@@ -55,7 +55,8 @@ public: @@ -53,7 +53,8 @@ public:
Boolean authenticate( Boolean authenticate(
const String& userName, const String& userName,
@ -390,10 +390,10 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.old
Boolean validateUser(const String& userName); Boolean validateUser(const String& userName);
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.old pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.old 2007-06-29 19:43:15.000000000 +0200 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.local-or-remote-auth 2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -85,7 +85,8 @@ PAMBasicAuthenticator::~PAMBasicAuthenti @@ -73,7 +73,8 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
Boolean PAMBasicAuthenticator::authenticate( Boolean PAMBasicAuthenticator::authenticate(
const String& userName, const String& userName,
@ -403,10 +403,10 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.c
{ {
PEG_METHOD_ENTER(TRC_AUTHENTICATION, PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()"); "PAMBasicAuthenticator::authenticate()");
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.old pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.old 2007-05-25 20:35:18.000000000 +0200 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.local-or-remote-auth 2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -72,13 +72,14 @@ PAMBasicAuthenticator::~PAMBasicAuthenti @@ -64,13 +64,14 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
Boolean PAMBasicAuthenticator::authenticate( Boolean PAMBasicAuthenticator::authenticate(
const String& userName, const String& userName,
@ -423,10 +423,10 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.c
{ {
return false; return false;
} }
diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.old pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.local-or-remote-auth pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp
--- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.old 2008-01-28 10:33:28.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.local-or-remote-auth 2008-12-16 19:57:08.000000000 +0100
+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -241,7 +241,7 @@ Boolean SecureBasicAuthenticator::authen @@ -236,7 +236,7 @@ Boolean SecureBasicAuthenticator::authen
if (Executor::detectExecutor() == 0) if (Executor::detectExecutor() == 0)
{ {
if (Executor::authenticatePassword( if (Executor::authenticatePassword(
@ -435,12 +435,12 @@ diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cp
{ {
authenticated = true; authenticated = true;
} }
diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.old pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.old 2007-12-19 14:55:10.000000000 +0100 --- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.local-or-remote-auth 2008-12-18 19:52:02.000000000 +0100
+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2008-11-11 13:27:58.000000000 +0100 +++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2009-06-08 15:06:26.000000000 +0200
@@ -403,6 +403,9 @@ void HTTPAuthenticatorDelegator::handleH @@ -421,6 +421,9 @@ void HTTPAuthenticatorDelegator::handleH
Logger::STANDARD_LOG, System::CIMSERVER, Logger::TRACE, Tracer::LEVEL3,
"HTTPAuthenticatorDelegator - Authentication processing start")); "HTTPAuthenticatorDelegator - Authentication processing start");
+ // Let Authenticators know whether this user is Local or Remote: + // Let Authenticators know whether this user is Local or Remote:
+ httpMessage->authInfo->setRemoteUser( httpMessage->isFromRemoteHost ); + httpMessage->authInfo->setRemoteUser( httpMessage->isFromRemoteHost );

View File

@ -0,0 +1,62 @@
diff -up pegasus/mak/program-unix.mak_old pegasus/mak/program-unix.mak
--- pegasus/mak/program-unix.mak_old 2008-12-16 19:55:36.000000000 +0100
+++ pegasus/mak/program-unix.mak 2009-03-18 15:08:52.000000000 +0100
@@ -28,19 +28,10 @@
#//////////////////////////////////////////////////////////////////////////
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)
-ifndef LINK_RPATH_LINK
- LINK_RPATH_LINK = -Xlinker -rpath-link
-endif
-
-
TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
S_OBJECTS = $(TMP_OBJECTS:.s=.o)
@@ -52,15 +43,9 @@ FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM)
ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
- ifdef PEGASUS_USE_RELEASE_DIRS
- EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR)
- else
- EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_LIB_DIR)
- endif
-
ifeq ($(HAS_ICU_DEPENDENCY),true)
ifdef ICU_INSTALL
- EXTRA_LINK_FLAGS += $(LINK_RPATH) -Xlinker ${ICU_INSTALL}/lib
+ EXTRA_LINK_FLAGS += -Xlinker ${ICU_INSTALL}/lib
endif
endif
endif
diff -up pegasus/mak/shared-library-unix.mak_old pegasus/mak/shared-library-unix.mak
--- pegasus/mak/shared-library-unix.mak_old 2008-12-16 19:55:37.000000000 +0100
+++ pegasus/mak/shared-library-unix.mak 2009-03-18 15:12:40.000000000 +0100
@@ -94,15 +94,14 @@ ifeq ($(COMPILER),gnu)
ifneq ($(OS),darwin)
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) $(EXTRA_LINK_ARGUMENTS)
+ 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)

View File

@ -0,0 +1,12 @@
diff -up pegasus/env_var_Linux.status_old pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status_old 2009-06-08 16:35:15.000000000 +0200
+++ pegasus/env_var_Linux.status 2009-06-08 16:35:36.000000000 +0200
@@ -34,7 +34,7 @@ PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
PEGASUS_CIM_SCHEMA=CIM217
PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
PEGASUS_PROD_DIR = /usr
PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin

View File

@ -1,18 +1,17 @@
diff -up pegasus/env_var_Linux.status.old pegasus/env_var_Linux.status diff -up pegasus/env_var_Linux.status_old pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.old 2008-10-28 18:44:08.000000000 +0100 --- pegasus/env_var_Linux.status_old 2009-01-23 00:39:36.000000000 +0100
+++ pegasus/env_var_Linux.status 2008-11-06 15:09:20.000000000 +0100 +++ pegasus/env_var_Linux.status 2009-03-12 16:08:47.000000000 +0100
@@ -19,7 +19,9 @@ ifndef PEGASUS_STAGING_DIR @@ -19,7 +19,8 @@ ifndef PEGASUS_STAGING_DIR
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif endif
-PEGASUS_DISABLE_CQL=true -PEGASUS_ENABLE_CQL=false
+PEGASUS_ENABLE_CQL=true +PEGASUS_ENABLE_CQL=true
+PEGASUS_DEFAULT_ENABLE_OOP=true +PEGASUS_DEFAULT_ENABLE_OOP=true
+
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_DISABLE_PERFINST=yes PEGASUS_DISABLE_PERFINST=yes
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -28,7 +30,6 @@ PEGASUS_HAS_SSL=yes @@ -28,7 +29,6 @@ PEGASUS_HAS_SSL=yes
PEGASUS_USE_SSL_RANDOMFILE=false PEGASUS_USE_SSL_RANDOMFILE=false
PEGASUS_NOASSERTS=yes PEGASUS_NOASSERTS=yes
PEGASUS_PAM_AUTHENTICATION=true PEGASUS_PAM_AUTHENTICATION=true
@ -20,11 +19,12 @@ diff -up pegasus/env_var_Linux.status.old pegasus/env_var_Linux.status
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true PEGASUS_USE_SYSLOGS=true
@@ -67,22 +68,21 @@ PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VA @@ -72,23 +72,22 @@ PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VA
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
+PEGASUS_CONFIG_DIR = /etc/Pegasus +PEGASUS_CONFIG_DIR = /etc/Pegasus
PEGASUS_CORE_DIR = $(PEGASUS_TRACE_DIR)
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
PEGASUS_PLANNED_CONFIG_FILE_PATH = \ PEGASUS_PLANNED_CONFIG_FILE_PATH = \
- $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE) - $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)

View File

@ -1,7 +1,7 @@
diff -up pegasus/mak/config-linux.mak.kadsparc pegasus/mak/config-linux.mak diff -up pegasus/mak/config-linux.mak.sparc pegasus/mak/config-linux.mak
--- pegasus/mak/config-linux.mak.kadsparc 2009-02-01 22:09:42.000000000 +0200 --- pegasus/mak/config-linux.mak.sparc 2009-06-09 14:21:24.000000000 +0200
+++ pegasus/mak/config-linux.mak 2009-02-01 22:09:44.000000000 +0200 +++ pegasus/mak/config-linux.mak 2009-06-09 14:22:04.000000000 +0200
@@ -204,7 +204,11 @@ ifndef PEGASUS_ARCH_LIB @@ -148,7 +148,11 @@ ifndef PEGASUS_ARCH_LIB
ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU) ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)
PEGASUS_ARCH_LIB = lib64 PEGASUS_ARCH_LIB = lib64
else else
@ -14,9 +14,9 @@ diff -up pegasus/mak/config-linux.mak.kadsparc pegasus/mak/config-linux.mak
endif endif
endif endif
DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\" DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"
diff -up /dev/null pegasus/mak/platform_LINUX_SPARC64_GNU.mak diff -up pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc pegasus/mak/platform_LINUX_SPARC64_GNU.mak
--- /dev/null 2009-01-27 08:59:09.640007309 +0200 --- pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc 2009-06-09 16:09:54.000000000 +0200
+++ pegasus/mak/platform_LINUX_SPARC64_GNU.mak 2009-02-01 22:09:44.000000000 +0200 +++ pegasus/mak/platform_LINUX_SPARC64_GNU.mak 2009-06-09 14:22:46.000000000 +0200
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//
@ -54,9 +54,9 @@ diff -up /dev/null pegasus/mak/platform_LINUX_SPARC64_GNU.mak
+include $(ROOT)/mak/config-linux.mak +include $(ROOT)/mak/config-linux.mak
+ +
+ARCHITECTURE = sparc +ARCHITECTURE = sparc
diff -up /dev/null pegasus/mak/platform_LINUX_SPARCV9_GNU.mak diff -up pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc pegasus/mak/platform_LINUX_SPARCV9_GNU.mak
--- /dev/null 2009-01-27 08:59:09.640007309 +0200 --- pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc 2009-06-09 16:10:03.000000000 +0200
+++ pegasus/mak/platform_LINUX_SPARCV9_GNU.mak 2009-02-01 22:09:44.000000000 +0200 +++ pegasus/mak/platform_LINUX_SPARCV9_GNU.mak 2009-06-09 14:23:28.000000000 +0200
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//
@ -94,39 +94,51 @@ diff -up /dev/null pegasus/mak/platform_LINUX_SPARCV9_GNU.mak
+include $(ROOT)/mak/config-linux.mak +include $(ROOT)/mak/config-linux.mak
+ +
+ARCHITECTURE = sparc +ARCHITECTURE = sparc
diff -up pegasus/mak/SDKMakefile.kadsparc pegasus/mak/SDKMakefile diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile
--- pegasus/mak/SDKMakefile.kadsparc 2009-02-01 22:09:43.000000000 +0200 --- pegasus/mak/SDKMakefile.sparc 2009-06-09 14:23:42.000000000 +0200
+++ pegasus/mak/SDKMakefile 2009-02-01 22:09:44.000000000 +0200 +++ pegasus/mak/SDKMakefile 2009-06-09 15:40:23.000000000 +0200
@@ -350,6 +350,12 @@ createSDKEnvVarFile: @@ -461,6 +461,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t
@$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),sparc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),sparc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' PEGASUS_PROVIDER_LIB_DIR = /usr/lib64/Pegasus/providers' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@$(ECHO) "ifndef PEGASUS_SAMPLES_DIR" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/SDKEnvVar.mak
@@ -423,6 +429,12 @@ createConfigFile:
@$(ECHO) ' ifeq ($$(shell uname -i),x86_64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO) ' PEGASUS_PLATFORM = LINUX_X86_64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),sparc)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_SPARCV9_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' ifeq ($$(shell uname -i),sparc64)' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' PEGASUS_PLATFORM = LINUX_SPARC64_GNU' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO) ' endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO) 'endif' >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO) "" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
diff -up pegasus/src/Pegasus/Common/Config.h.kadsparc pegasus/src/Pegasus/Common/Config.h @$(ECHO-E) " endif" \
--- pegasus/src/Pegasus/Common/Config.h.kadsparc 2009-02-01 22:14:43.000000000 +0200 >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+++ pegasus/src/Pegasus/Common/Config.h 2009-02-01 22:15:46.000000000 +0200 + @$(ECHO-E) " ifeq (\044(shell uname -i),sparc)" \
@@ -70,6 +70,10 @@ + >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_PLATFORM = LINUX_SPARCV9_GNU" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " endif" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " ifeq (\044(shell uname -i),sparc64)" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_PLATFORM = LINUX_SPARC64_GNU" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " endif" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
else
$(error This SDK has been defined to include the following \
platforms: $(PACKAGED_PLATFORM_FILES). \
@@ -517,6 +529,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO-E) "endif" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_SPARCV9_GNU)" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_ARCH_LIB = lib" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) "endif" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_SPARC64_GNU)" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_ARCH_LIB = lib64" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) "endif" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
else
$(error This SDK has been defined to include the following \
platforms: $(PACKAGED_PLATFORM_FILES). \
diff -up pegasus/src/Pegasus/Common/Config.h.sparc pegasus/src/Pegasus/Common/Config.h
--- pegasus/src/Pegasus/Common/Config.h.sparc 2009-06-09 15:43:48.000000000 +0200
+++ pegasus/src/Pegasus/Common/Config.h 2009-06-09 15:44:43.000000000 +0200
@@ -76,6 +76,10 @@
# include <Pegasus/Common/Platform_LINUX_PPC_GNU.h> # include <Pegasus/Common/Platform_LINUX_PPC_GNU.h>
#elif defined (PEGASUS_PLATFORM_LINUX_PPC64_GNU) #elif defined (PEGASUS_PLATFORM_LINUX_PPC64_GNU)
# include <Pegasus/Common/Platform_LINUX_PPC64_GNU.h> # include <Pegasus/Common/Platform_LINUX_PPC64_GNU.h>
@ -137,9 +149,9 @@ diff -up pegasus/src/Pegasus/Common/Config.h.kadsparc pegasus/src/Pegasus/Common
#elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES_GNU) #elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES_GNU)
# include <Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h> # include <Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h>
#elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES64_GNU) #elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES64_GNU)
diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.kadsparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.kadsparc 2009-02-01 22:17:12.000000000 +0200 --- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc 2009-06-09 16:10:36.000000000 +0200
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2009-02-01 22:17:49.000000000 +0200 +++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2009-06-09 15:46:22.000000000 +0200
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
+//%2006//////////////////////////////////////////////////////////////////////// +//%2006////////////////////////////////////////////////////////////////////////
@ -234,9 +246,9 @@ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.kadsparc pegasu
+#endif +#endif
+ +
+#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */ +#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */
diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.kadsparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.kadsparc 2009-02-01 22:19:35.000000000 +0200 --- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc 2009-06-09 16:10:50.000000000 +0200
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2009-02-01 22:19:59.000000000 +0200 +++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2009-06-09 15:47:38.000000000 +0200
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
+//%2006//////////////////////////////////////////////////////////////////////// +//%2006////////////////////////////////////////////////////////////////////////
@ -331,36 +343,9 @@ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.kadsparc pegasu
+#endif +#endif
+ +
+#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */ +#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */
diff -up pegasus/src/SDK/samples/mak/config.mak.kadsparc pegasus/src/SDK/samples/mak/config.mak diff -up pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak
--- pegasus/src/SDK/samples/mak/config.mak.kadsparc 2007-01-11 18:22:06.000000000 +0200 --- pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc 2009-06-09 16:11:24.000000000 +0200
+++ pegasus/src/SDK/samples/mak/config.mak 2009-02-01 22:09:44.000000000 +0200 +++ pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak 2009-06-09 16:04:48.000000000 +0200
@@ -38,6 +38,8 @@ VALID_PLATFORMS = \
LINUX_PPC64_GNU \
LINUX_IA64_GNU \
LINUX_X86_64_GNU \
+ LINUX_SPARCV9_GNU \
+ LINUX_SPARC64_GNU \
LINUX_ZSERIES_GNU \
LINUX_ZSERIES64_GNU \
AIX_RS_IBMCXX \
@@ -81,6 +83,14 @@ ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_G
include $(ROOT)/mak/$(PEGASUS_PLATFORM).mak
endif
+ifeq ($(PEGASUS_PLATFORM),LINUX_SPARCV9_GNU)
+ include $(ROOT)/mak/$(PEGASUS_PLATFORM).mak
+endif
+
+ifeq ($(PEGASUS_PLATFORM),LINUX_SPARC64_GNU)
+ include $(ROOT)/mak/$(PEGASUS_PLATFORM).mak
+endif
+
ifeq ($(PEGASUS_PLATFORM),LINUX_ZSERIES_GNU)
include $(ROOT)/mak/$(PEGASUS_PLATFORM).mak
endif
diff -up /dev/null pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak
--- /dev/null 2009-01-27 08:59:09.640007309 +0200
+++ pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak 2009-02-01 22:09:44.000000000 +0200
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//
@ -417,9 +402,9 @@ diff -up /dev/null pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak
+LINK_OUT = -o +LINK_OUT = -o
+SYM_LINK_LIB = $(PEGASUS_PROVIDER_LIB_DIR)/lib$(LIBRARY) +SYM_LINK_LIB = $(PEGASUS_PROVIDER_LIB_DIR)/lib$(LIBRARY)
+PLATFORM_LIB_SUFFIX = so +PLATFORM_LIB_SUFFIX = so
diff -up /dev/null pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak diff -up pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak
--- /dev/null 2009-01-27 08:59:09.640007309 +0200 --- pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc 2009-06-09 16:11:37.000000000 +0200
+++ pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak 2009-02-01 22:09:44.000000000 +0200 +++ pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak 2009-06-09 16:05:28.000000000 +0200
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//

View File

@ -1 +1 @@
f5026a5ba7bcde7b04f882b0b2d205ed pegasus-2.7.2.tar.gz 6cd2b72831a389033c0a9471d28bc257 pegasus-2.9.0.tar.gz

View File

@ -40,10 +40,8 @@
%endif %endif
%endif %endif
%define _default_patch_fuzz 2 Version: 2.9.0
Release: 1%{?dist}
Version: 2.7.2
Release: 8%{?dist}
Epoch: 2 Epoch: 2
# #
Summary: OpenPegasus WBEM Services for Linux Summary: OpenPegasus WBEM Services for Linux
@ -60,27 +58,27 @@ Source1: README.RedHat.Security
Source2: genOpenPegasusSSLCerts Source2: genOpenPegasusSSLCerts
Source3: pegasus_arch_alternatives Source3: pegasus_arch_alternatives
Source4: RedHat.OpenPegasus.Makefile Source4: RedHat.OpenPegasus.Makefile
Source5: README.RedHat.SSL
# #
# 0: Still not fixed by http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5008 # 0: Still not fixed by http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5008
Patch0: pegasus-2.7.0-initscript.patch Patch0: pegasus-2.9.0-initscript.patch
# 1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011 # 1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011
Patch1: pegasus-2.7.0-no-rpath.patch Patch1: pegasus-2.9.0-no-rpath.patch
Patch2: pegasus-2.7.0-PIE.patch Patch2: pegasus-2.7.0-PIE.patch
# 3: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5016 # 3: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5016
Patch3: pegasus-2.7.0-redhat-config.patch Patch3: pegasus-2.9.0-redhat-config.patch
# 4: don't see how http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5099 fixed it # 4: don't see how http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5099 fixed it
Patch4: pegasus-2.6.0-cmpi-provider-lib.patch Patch4: pegasus-2.9.0-cmpi-provider-lib.patch
# 5: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5010 # 5: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5010
Patch5: pegasus-2.7.2-local-or-remote-auth.patch Patch5: pegasus-2.9.0-local-or-remote-auth.patch
# 6: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5012 # 6: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5012
Patch6: pegasus-2.5.1-pam-wbem.patch Patch6: pegasus-2.5.1-pam-wbem.patch
# 7: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5006 # 7: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5006
Patch7: pegasus-2.5.1-fix_tests.patch Patch7: pegasus-2.9.0-fix_tests.patch
Patch8: pegasus-2.6.0-multilib.patch
Patch9: pegasus-2.6.0-cimuser.patch Patch9: pegasus-2.6.0-cimuser.patch
Patch11: pegasus-2.7.0-no_privilege_separation.patch Patch11: pegasus-2.9.0-no_privilege_separation.patch
Patch12: pegasus-2.7.0-no_snmp_tests.patch Patch12: pegasus-2.7.0-no_snmp_tests.patch
Patch13: pegasus-2.7.1-sparc.patch Patch13: pegasus-2.9.0-sparc.patch
Patch14: pegasus-2.7.2-baseelif.patch Patch14: pegasus-2.7.2-baseelif.patch
# #
Conflicts: openwbem Conflicts: openwbem
@ -90,17 +88,18 @@ BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++
BuildRequires: imake, libstdc++, make, pam-devel BuildRequires: imake, libstdc++, make, pam-devel
BuildRequires: openssl-devel >= 0.9.8b, e2fsprogs BuildRequires: openssl-devel >= 0.9.8b, e2fsprogs
BuildRequires: net-snmp-devel BuildRequires: net-snmp-devel
#
Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam
Requires: redhat-lsb, chkconfig, sysvinit Requires: chkconfig, sysvinit
Requires: e2fsprogs, bind-utils, net-tools Requires: e2fsprogs, bind-utils, net-tools
Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam Requires(post): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam
Requires(post): redhat-lsb, chkconfig, sysvinit Requires(post): chkconfig, sysvinit
Requires(post): e2fsprogs, bind-utils, net-tools Requires(post): e2fsprogs, bind-utils, net-tools
Requires(pre): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam Requires(pre): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam
Requires(pre): redhat-lsb, chkconfig, sysvinit Requires(pre): chkconfig, sysvinit
Requires(pre): e2fsprogs, bind-utils, net-tools Requires(pre): e2fsprogs, bind-utils, net-tools
Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam Requires(postun): bash, sed, grep, coreutils, procps, openssl >= 0.9.8b, pam
Requires(postun): redhat-lsb, chkconfig, sysvinit Requires(postun): chkconfig, sysvinit
Requires(postun): e2fsprogs, bind-utils, net-tools Requires(postun): e2fsprogs, bind-utils, net-tools
Requires: net-snmp Requires: net-snmp
@ -114,7 +113,7 @@ sources.
%package devel %package devel
Summary: The OpenPegasus Software Development Kit Summary: The OpenPegasus Software Development Kit
Group: Systems Management/Base Group: Systems Management/Base
PreReq: tog-pegasus >= %{version}-%{release} Requires: tog-pegasus >= %{version}-%{release}
Obsoletes: tog-pegasus-sdk Obsoletes: tog-pegasus-sdk
Requires: make, gcc, gcc-c++ Requires: make, gcc, gcc-c++
Requires(preun): make Requires(preun): make
@ -129,7 +128,7 @@ supports C provider developers via the CMPI interface.
%package test %package test
Summary: The OpenPegasus Tests Summary: The OpenPegasus Tests
Group: Systems Management/Base Group: Systems Management/Base
PreReq: tog-pegasus >= %{version}-%{release}, make Requires: tog-pegasus >= %{version}-%{release}, make
%description test %description test
The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
@ -137,20 +136,19 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%prep %prep
%setup -q -n %{srcname} %setup -q -n %{srcname}
%patch0 -p1 -b .initscript
%patch1 -p1 -b .no-rpath %patch1 -p1 -b .no-rpath
%patch2 -p1 -b .PIE %patch2 -p1 -b .PIE
%patch3 -p1 -b .redhat-config %patch3 -p1 -b .redhat-config
%patch4 -p1 -b .cmpi-provider-lib %patch4 -p1 -b .cmpi-provider-lib
%patch6 -p1 -b .pam-wbem %patch6 -p1 -b .pam-wbem
%patch7 -p1 -b .fix-tests %patch7 -p1 -b .fix-tests
%patch8 -p1 -b .multilib
%patch9 -p1 -b .cimuser %patch9 -p1 -b .cimuser
%patch11 -p1 -b .no_privilege_separation %patch11 -p1 -b .no_privilege_separation
%patch12 -p1 -b .no_snmp_tests %patch12 -p1 -b .no_snmp_tests
%patch5 -p1 -b .local-or-remote-auth %patch5 -p1 -b .local-or-remote-auth
%patch13 -p1 -b .sparc %patch13 -p1 -b .sparc
%patch14 -p1 -b .bareelif %patch14 -p1 -b .bareelif
%patch0 -p1 -b .initscript
find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:; find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
%build %build
@ -158,6 +156,7 @@ rm -rf ${RPM_BUILD_ROOT} || :;
cp -fp %SOURCE1 doc cp -fp %SOURCE1 doc
cp -fp %SOURCE2 rpm cp -fp %SOURCE2 rpm
cp -fp %SOURCE4 .; cp -fp %SOURCE4 .;
cp -fp %SOURCE5 doc
export RPM_ARCH_LIB=%{_lib} export RPM_ARCH_LIB=%{_lib}
export RPM_ARCH=%{_target_cpu} export RPM_ARCH=%{_target_cpu}
@ -347,7 +346,7 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
/usr/share/Pegasus/mof /usr/share/Pegasus/mof
/usr/share/man/man8/* /usr/share/man/man8/*
/usr/share/man/man1/* /usr/share/man/man1/*
%doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.RedHat.Security src/Clients/repupgrade/doc/repupgrade.html doc/README.RedHat.SSL
%files devel -f ghost_arch_devel %files devel -f ghost_arch_devel
@ -462,6 +461,11 @@ fi
%changelog %changelog
* Mon Jun 16 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.9.0-1
- Update to upstream version 2.9.0
- Remove redhat-lsb requires
- Add README.RedHat.SSL
* Thu Apr 16 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.7.2-8 * Thu Apr 16 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.7.2-8
- Replace useradd '-n' option by '-N' ('-n' is obsolete) - Replace useradd '-n' option by '-N' ('-n' is obsolete)
Resolves: #495729 Resolves: #495729
@ -599,7 +603,7 @@ fi
- Fix bug 193121: restore world read access to libraries - Fix bug 193121: restore world read access to libraries
* Tue May 02 2006 Jason Vas Dias <jvdias@redhat.com> - 2:2.5.1-4 * Tue May 02 2006 Jason Vas Dias <jvdias@redhat.com> - 2:2.5.1-4
- fix bug 190432: %exclude /usr/lib/debug from RPM - fix bug 190432: %%exclude /usr/lib/debug from RPM
- fix upstream OpenPegasus '2.5.2_APPROVED' bugs, applying upstream patches: - fix upstream OpenPegasus '2.5.2_APPROVED' bugs, applying upstream patches:
o 4955 : Bogus Description property for OperatingSystem provider o 4955 : Bogus Description property for OperatingSystem provider
o 4956 : reserveCapacity method may cause size overflow on invalid input o 4956 : reserveCapacity method may cause size overflow on invalid input
@ -617,7 +621,7 @@ fi
* Fri Apr 14 2006 Jason Vas Dias <jvdias@redhat.com> - 2:2.5.1-2 * Fri Apr 14 2006 Jason Vas Dias <jvdias@redhat.com> - 2:2.5.1-2
- Apply patches for the two '2.5.2_APPROVED' upstream bugzillas - Apply patches for the two '2.5.2_APPROVED' upstream bugzillas
4934(4943) and 4945 : 4934(4943) and 4945 :
(http://cvs.opengroup.org/bugzilla/buglist.cgi?bug_id=4943%2C4945) (http://cvs.opengroup.org/bugzilla/buglist.cgi?bug_id=4943%%2C4945)
- Fix the PATH_MAX and MAXHOSTNAMELEN issues (again) - Fix the PATH_MAX and MAXHOSTNAMELEN issues (again)
* Thu Apr 06 2006 Jason Vas Dias <jvdias@redhat.com> - 2:2.5.1-1 * Thu Apr 06 2006 Jason Vas Dias <jvdias@redhat.com> - 2:2.5.1-1