--- pegasus/env_var_Linux.status.redhat-config	2006-03-15 20:33:51.000000000 -0500
+++ pegasus/env_var_Linux.status	2006-04-10 14:29:52.000000000 -0400
@@ -18,7 +18,7 @@
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
 
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
 PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
 PEGASUS_DISABLE_PERFINST=yes
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -26,7 +26,6 @@
 PEGASUS_HAS_SSL=yes
 PEGASUS_NOASSERTS=yes
 PEGASUS_PAM_AUTHENTICATION=true
-PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
@@ -64,22 +63,21 @@
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
 PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
 PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
+PEGASUS_CONFIG_DIR = /etc/Pegasus
 PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
 PEGASUS_PLANNED_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 PEGASUS_CURRENT_CONFIG_FILE = cimserver_current.conf
 PEGASUS_CURRENT_CONFIG_FILE_PATH = \
-     $(PEGASUS_VARDATA_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
+     $(PEGASUS_CONFIG_DIR)/$(PEGASUS_CURRENT_CONFIG_FILE)
 
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
 PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 CIMSERVER_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
+PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
 PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
      $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
 
--- pegasus/Makefile.Release.redhat-config	2006-01-30 11:16:16.000000000 -0500
+++ pegasus/Makefile.Release	2006-04-08 18:28:43.000000000 -0400
@@ -590,10 +590,10 @@
 	$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
 
 stage_PegasusVarDataDirectoryFiles: FORCE
-	$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+	$(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 setpermissions_PegasusVarDataDirectoryFiles: FORCE
-	$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+	$(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
 
 stage_genOpenPegasusSSLCertsFile: FORCE
 	@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1233,7 +1233,7 @@
 	@$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 	@$(ECHO-E) "%config(noreplace)" \
-            "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+            "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 	@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)