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

Diff for /pegasus/src/Pegasus/Common/SystemUnix.cpp between version 1.99 and 1.100

version 1.99, 2005/03/08 02:54:34 version 1.100, 2005/03/29 19:16:02
Line 627 
Line 627 
     //     //
     // Get wbem-local port from /etc/services     // Get wbem-local port from /etc/services
     //     //
 #if !defined(PEGASUS_OS_OS400)  
 #ifdef PEGASUS_OS_SOLARIS #ifdef PEGASUS_OS_SOLARIS
 #define SERV_BUFF_SIZE  1024 #define SERV_BUFF_SIZE  1024
     struct servent      serv_result;     struct servent      serv_result;
Line 635 
Line 635 
  
     if ( (serv = getservbyname_r(serviceName, TCP, &serv_result,     if ( (serv = getservbyname_r(serviceName, TCP, &serv_result,
                                 buf, SERV_BUFF_SIZE)) != NULL )                                 buf, SERV_BUFF_SIZE)) != NULL )
   #elif defined(PEGASUS_OS_OS400)
       struct servent      serv_result;
       serv = &serv_result;
       struct servent_data buf;
       memset(&buf, 0x00, sizeof(struct servent_data));
   
       if ( (getservbyname_r((char*)serviceName, TCP, &serv_result,
                                   &buf)) == 0 )
 #else // PEGASUS_OS_SOLARIS #else // PEGASUS_OS_SOLARIS
     if ( (serv = getservbyname(serviceName, TCP)) != NULL )     if ( (serv = getservbyname(serviceName, TCP)) != NULL )
 #endif // PEGASUS_OS_SOLARIS #endif // PEGASUS_OS_SOLARIS
 #else  // !PEGASUS_OS_OS400  
     // Note - serviceName came from Constants.h - no need to  
     // convert to EBCDIC  
     // Need to cast on OS/400  
     if ( (serv = getservbyname((char *)serviceName, TCP)) != NULL )  
 #endif  // !PEGASUS_OS_OS400  
     {     {
         localPort = htons((uint16_t)serv->s_port);         localPort = htons((uint16_t)serv->s_port);
     }     }
Line 724 
Line 726 
  
 #if defined(PEGASUS_OS_SOLARIS) || \ #if defined(PEGASUS_OS_SOLARIS) || \
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined(PEGASUS_OS_LINUX)      defined(PEGASUS_OS_LINUX) || \
       defined(PEGASUS_OS_OS400)
  
     const unsigned int PWD_BUFF_SIZE = 1024;     const unsigned int PWD_BUFF_SIZE = 1024;
     struct passwd       local_pwd;     struct passwd       local_pwd;
Line 785 
Line 788 
  
 #if defined(PEGASUS_OS_SOLARIS) || \ #if defined(PEGASUS_OS_SOLARIS) || \
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined(PEGASUS_OS_LINUX)      defined(PEGASUS_OS_LINUX) || \
       defined(PEGASUS_OS_OS400)
  
     const unsigned int PWD_BUFF_SIZE = 1024;     const unsigned int PWD_BUFF_SIZE = 1024;
     struct passwd   pwd;     struct passwd   pwd;
Line 875 
Line 879 
         struct passwd*   pwd = NULL;         struct passwd*   pwd = NULL;
 #if defined(PEGASUS_OS_SOLARIS) || \ #if defined(PEGASUS_OS_SOLARIS) || \
     defined(PEGASUS_OS_HPUX) || \     defined(PEGASUS_OS_HPUX) || \
     defined(PEGASUS_OS_LINUX)      defined(PEGASUS_OS_LINUX) || \
       defined(PEGASUS_OS_OS400)
         const unsigned int PWD_BUFF_SIZE = 1024;         const unsigned int PWD_BUFF_SIZE = 1024;
         struct passwd   local_pwd;         struct passwd   local_pwd;
         char            buf[PWD_BUFF_SIZE];         char            buf[PWD_BUFF_SIZE];

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