(file) Return to config.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/config.mak between version 1.195.2.3 and 1.207

version 1.195.2.3, 2013/06/03 22:34:47 version 1.207, 2013/04/01 06:27:27
Line 239 
Line 239 
 ## NOTE: If the default below is changed, please update the definition ## NOTE: If the default below is changed, please update the definition
 ## of default for this variable in pegasus/doc/BuildAndReleaseOptions.html ## of default for this variable in pegasus/doc/BuildAndReleaseOptions.html
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM236      PEGASUS_CIM_SCHEMA=CIM231
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 1141 
Line 1141 
         DEFINES += -DPEGASUS_INDICATION_HASHTRACE         DEFINES += -DPEGASUS_INDICATION_HASHTRACE
     endif     endif
  
       # Setup the conditional compile for client displays.
       ifdef PEGASUS_CLIENT_TRACE_ENABLE
           DEFINES += -DPEGASUS_CLIENT_TRACE_ENABLE
       endif
 endif endif
  
 # compile in the experimental APIs # compile in the experimental APIs
Line 1357 
Line 1361 
  
 ##============================================================================== ##==============================================================================
 ## ##
 ## PEGASUS_PAM_SESSION_SECURITY  
 ##  
 ## This is a new method to handle authentication with PAM in case it is required  
 ## to keep the PAM session established by pam_start() open across an  
 ## entire CIM request.  
 ##  
 ## This feature contradicts PEGASUS_PAM_AUTHENTICATION and  
 ## PEGASUS_USE_PAM_STANDALONE_PROC  
 ## Because of the additional process this feature is not compatible with  
 ## Privilege Separation.  
 ##  
 ##==============================================================================  
   
 ifeq ($(PEGASUS_PAM_SESSION_SECURITY),true)  
     ifdef PEGASUS_PAM_AUTHENTICATION  
         $(error "PEGASUS_PAM_AUTHENTICATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     ifdef PEGASUS_USE_PAM_STANDALONE_PROC  
         $(error "PEGASUS_USE_PAM_STANDALONE_PROC must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  
         $(error "PEGASUS_ENABLE_PRIVILEGE_SEPARATION must NOT be defined when PEGASUS_PAM_SESSION_SECURITY is defined")  
     endif  
     # Compile in the code required for PAM  
     # and compile out the code that uses the password file.  
     DEFINES += -DPEGASUS_PAM_SESSION_SECURITY -DPEGASUS_NO_PASSWORDFILE  
     # Link with libpam only where it is needed.  
     ifeq ($(HAS_PAM_DEPENDENCY),true)  
         SYS_LIBS += -lpam  
     endif  
 endif  
   
   
 ##==============================================================================  
 ##  
 ## PEGASUS_PAM_AUTHENTICATION ## PEGASUS_PAM_AUTHENTICATION
 ## ##
 ##============================================================================== ##==============================================================================


Legend:
Removed from v.1.195.2.3  
changed lines
  Added in v.1.207

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2