(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.104.2.1 and 1.104.2.2

version 1.104.2.1, 2007/03/23 21:53:51 version 1.104.2.2, 2007/04/05 23:56:35
Line 204 
Line 204 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/var/opt/wbem/cimserver_planned.conf"     "/var/opt/wbem/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  \  
     "/var/opt/wbem/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      "/etc/opt/wbem/cimserver_start.conf" #  define PEGASUS_CIMSERVER_START_FILE      "/etc/opt/wbem/cimserver_start.conf"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
Line 238 
Line 235 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/opt/freeware/cimom/pegasus/etc/cimserver_planned.conf"     "/opt/freeware/cimom/pegasus/etc/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  \  
     "/opt/freeware/cimom/pegasus/etc/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf" #  define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
Line 270 
Line 264 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/var/opt/tog-pegasus/cimserver_planned.conf"     "/var/opt/tog-pegasus/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  \  
     "/var/opt/tog-pegasus/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid" #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/tog-pegasus/cimserver.pid"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
Line 302 
Line 293 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/etc/opt/lsb-pegasus/cimserver_planned.conf"     "/etc/opt/lsb-pegasus/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  \  
     "/etc/opt/lsb-pegasus/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/cimserver.pid" #  define PEGASUS_CIMSERVER_START_FILE      "/var/run/cimserver.pid"
 #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE #  undef PEGASUS_SSLCLIENT_CERTIFICATEFILE
Line 336 
Line 324 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/wbem_var/opt/wbem/cimserver_planned.conf"     "/wbem_var/opt/wbem/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  \  
     "/wbem_var/opt/wbem/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      \ #  define PEGASUS_CIMSERVER_START_FILE      \
     "/wbem_var/opt/wbem/cimserver_start.conf"     "/wbem_var/opt/wbem/cimserver_start.conf"
Line 361 
Line 346 
 #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/wbem/cimserver_current.conf" #  define PEGASUS_CURRENT_CONFIG_FILE_PATH  "/etc/wbem/cimserver_current.conf"
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/wbem/cimserver_planned.conf" #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  "/etc/wbem/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  "/etc/wbem/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      "/var/wbem/cimserver.pid" #  define PEGASUS_CIMSERVER_START_FILE      "/var/wbem/cimserver.pid"
 #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH #  undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH
Line 374 
Line 357 
 #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH #  undef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \ #  define PEGASUS_PLANNED_CONFIG_FILE_PATH  \
     "/etc/pegasus/cimserver_planned.conf"     "/etc/pegasus/cimserver_planned.conf"
 #  undef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #  define PEGASUS_POLICY_CONFIG_FILE_PATH  \  
     "/etc/pegasus/cimserver_policy.conf"  
 #  undef PEGASUS_CIMSERVER_START_FILE #  undef PEGASUS_CIMSERVER_START_FILE
 #  define PEGASUS_CIMSERVER_START_FILE      \ #  define PEGASUS_CIMSERVER_START_FILE      \
     "/var/cache/pegasus/cimserver_start.conf"     "/var/cache/pegasus/cimserver_start.conf"
Line 396 
Line 376 
 #ifndef PEGASUS_PLANNED_CONFIG_FILE_PATH #ifndef PEGASUS_PLANNED_CONFIG_FILE_PATH
 #define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf" #define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf"
 #endif #endif
 #ifndef PEGASUS_POLICY_CONFIG_FILE_PATH  
 #define PEGASUS_POLICY_CONFIG_FILE_PATH  "cimserver_policy.conf"  
 #endif  
 #ifndef PEGASUS_CIMSERVER_START_FILE #ifndef PEGASUS_CIMSERVER_START_FILE
 #define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf" #define PEGASUS_CIMSERVER_START_FILE      "/tmp/cimserver_start.conf"
 #endif #endif

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