(file) Return to Constants.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Constants.h between version 1.80.2.1 and 1.85

version 1.80.2.1, 2006/05/23 18:23:38 version 1.85, 2006/08/01 17:47:02
Line 343 
Line 343 
 // //
  
 #define CIMSERVER_LOCK_FILE               "cimserver_start.lock" #define CIMSERVER_LOCK_FILE               "cimserver_start.lock"
   #define PEGASUS_REPOSITORY_DIR            "repository"
   #define PEGASUS_CURRENT_CONFIG_FILE_PATH  "cimserver_current.conf"
   #define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf"
   #define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
 #define PEGASUS_SSLCLIENT_CERTIFICATEFILE "client.pem" #define PEGASUS_SSLCLIENT_CERTIFICATEFILE "client.pem"
 #define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd" #define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd"
 #define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd" #define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd"
Line 359 
Line 363 
 # if defined(PEGASUS_OS_HPUX) # if defined(PEGASUS_OS_HPUX)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/var/opt/wbem/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/var/opt/wbem/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/opt/wbem/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/var/opt/wbem/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/var/opt/wbem/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/etc/opt/wbem/cimserver_start.conf"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/hp/sslshare/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/hp/sslshare/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
Line 372 
Line 384 
 #  undef PEGASUS_CORE_DIR #  undef PEGASUS_CORE_DIR
 #  define PEGASUS_CORE_DIR                  "/var/opt/wbem" #  define PEGASUS_CORE_DIR                  "/var/opt/wbem"
 #  undef PEGASUS_PAM_STANDALONE_PROC_NAME #  undef PEGASUS_PAM_STANDALONE_PROC_NAME
 #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/wbem/sbin/cimservera"  #  define PEGASUS_PAM_STANDALONE_PROC_NAME  "/opt/wbem/lbin/cimservera"
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/wbem/sbin/cimprovagt"  #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/wbem/lbin/cimprovagt"
 # elif defined(PEGASUS_OS_AIX) # elif defined(PEGASUS_OS_AIX)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/opt/freeware/cimom/pegasus/etc/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/opt/freeware/cimom/pegasus/etc/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/opt/freeware/cimom/pegasus/etc/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/opt/freeware/cimom/pegasus/etc/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/opt/freeware/cimom/pegasus/etc/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/opt/freeware/cimom/pegasus/etc/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/opt/freeware/cimom/pegasus/etc/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
Line 391 
Line 411 
 # elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB) # elif defined(PEGASUS_OS_LINUX) && !defined(PEGASUS_OS_LSB)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/var/opt/tog-pegasus/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/var/opt/tog-pegasus/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/opt/tog-pegasus/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/var/opt/tog-pegasus/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/var/opt/tog-pegasus/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/tog-pegasus/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
Line 408 
Line 436 
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/opt/tog-pegasus/sbin/cimprovagt"
 # elif defined(PEGASUS_OS_LSB) # elif defined(PEGASUS_OS_LSB)
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/opt/lsb-pegasus/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/opt/lsb-pegasus/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/opt/lsb-pegasus/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/cimserver.pid"
   #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem" #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/etc/opt/lsb-pegasus/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
 #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/var/opt/lsb-pegasus/ssl.rnd" #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/var/opt/lsb-pegasus/ssl.rnd"
Line 426 
Line 463 
 # elif defined(PEGASUS_OS_VMS) # elif defined(PEGASUS_OS_VMS)
 #  undef CIMSERVER_LOCK_FILE #  undef CIMSERVER_LOCK_FILE
 #  define CIMSERVER_LOCK_FILE               "/wbem_var/opt/wbem/cimserver_start.lock" #  define CIMSERVER_LOCK_FILE               "/wbem_var/opt/wbem/cimserver_start.lock"
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/wbem_var/opt/wbem/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/wbem_var/opt/wbem/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/wbem_var/opt/wbem/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/wbem_var/opt/wbem/cimserver_start.conf"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
 #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/wbem_var/opt/wbem/client.pem"  #  define PEGASUS_SSLCLIENT_CERTIFICATEFILE "/wbem_etc/opt/hp/sslshare/client.pem"
 #  undef PEGASUS_SSLCLIENT_RANDOMFILE #  undef PEGASUS_SSLCLIENT_RANDOMFILE
 #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/wbem_var/opt/wbem/ssl.rnd" #  define PEGASUS_SSLCLIENT_RANDOMFILE      "/wbem_var/opt/wbem/ssl.rnd"
 #  undef PEGASUS_SSLSERVER_RANDOMFILE #  undef PEGASUS_SSLSERVER_RANDOMFILE
Line 437 
Line 482 
 #  undef PEGASUS_PAM_STANDALONE_PROC_NAME #  undef PEGASUS_PAM_STANDALONE_PROC_NAME
 #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME #  undef PEGASUS_PROVIDER_AGENT_PROC_NAME
 #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/wbem_var/opt/wbem/bin/cimprovagt" #  define PEGASUS_PROVIDER_AGENT_PROC_NAME  "/wbem_var/opt/wbem/bin/cimprovagt"
   # elif defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
   #  undef PEGASUS_REPOSITORY_DIR
   #  define PEGASUS_REPOSITORY_DIR            "/var/wbem/repository"
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/wbem/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/wbem/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver.pid"
   # elif defined(PEGASUS_OS_DARWIN)
   #  undef PEGASUS_CURRENT_CONFIG_FILE_PATH
   #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/pegasus/cimserver_current.conf"
   #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
   #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/pegasus/cimserver_planned.conf"
   #  undef PEGASUS_CIMSERVER_START_FILE
   #  define PEGASUS_CIMSERVER_START_FILE      "/var/cache/pegasus/cimserver_start.conf"
 # endif # endif
 #endif #endif
 #endif #endif
Line 473 
Line 534 
 #define PG_PROVMODULE_USERCTXT_DESIGNATED 3 #define PG_PROVMODULE_USERCTXT_DESIGNATED 3
 #define PG_PROVMODULE_USERCTXT_PRIVILEGED 4 #define PG_PROVMODULE_USERCTXT_PRIVILEGED 4
 #define PG_PROVMODULE_USERCTXT_CIMSERVER 5 #define PG_PROVMODULE_USERCTXT_CIMSERVER 5
   
   #ifdef PEGASUS_DEFAULT_USERCTXT_REQUESTOR
   #define PEGASUS_DEFAULT_PROV_USERCTXT PG_PROVMODULE_USERCTXT_REQUESTOR
   #else
 #define PEGASUS_DEFAULT_PROV_USERCTXT PG_PROVMODULE_USERCTXT_PRIVILEGED #define PEGASUS_DEFAULT_PROV_USERCTXT PG_PROVMODULE_USERCTXT_PRIVILEGED
   #endif
  
 // Standard Pegasus Global Prefix. // Standard Pegasus Global Prefix.
 // This prefix is used as the basis for pegasus defined classes // This prefix is used as the basis for pegasus defined classes

Legend:
Removed from v.1.80.2.1  
changed lines
  Added in v.1.85
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2