(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.66 and 1.73.2.4

version 1.66, 2003/08/27 01:38:18 version 1.73.2.4, 2004/04/24 21:02:05
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2003////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
   // IBM Corp.; EMC Corporation, The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 37 
Line 39 
 # include <dll.h> # include <dll.h>
 #elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM) #elif defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM)
 #  include <fcntl.h> #  include <fcntl.h>
 #  include <qycmutiltyUtility.H>  #  include <qycmutilu2.H>
 #  include <unistd.cleinc> #  include <unistd.cleinc>
 #  include "qycmmsgclsMessage.H" // ycmMessage class #  include "qycmmsgclsMessage.H" // ycmMessage class
 #  include "OS400SystemState.h"  // OS400LoadDynamicLibrary, etc #  include "OS400SystemState.h"  // OS400LoadDynamicLibrary, etc
Line 50 
Line 52 
 #include <dirent.h> #include <dirent.h>
 #include <pwd.h> #include <pwd.h>
  
   #if defined(PEGASUS_OS_SOLARIS)
   #include <string.h>
   #endif
   #include <errno.h>
   
 #if !defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) && !defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM) #if !defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) && !defined(PEGASUS_PLATFORM_OS400_ISERIES_IBM)
 #include <crypt.h> #include <crypt.h>
 #endif #endif
Line 72 
Line 79 
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/Destroyer.h> #include <Pegasus/Common/Destroyer.h>
 #include <Pegasus/Common/InternalException.h> #include <Pegasus/Common/InternalException.h>
   #ifdef PEGASUS_ZOS_SECURITY
   #include "DynamicLibraryzOS_inline.h"
   #endif
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 412 
Line 422 
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return DynamicLibraryHandle(dlopen(fileName, RTLD_NOW));     return DynamicLibraryHandle(dlopen(fileName, RTLD_NOW));
 #elif defined(PEGASUS_OS_ZOS) #elif defined(PEGASUS_OS_ZOS)
           #if defined(PEGASUS_ZOS_SECURITY)
                   if (!hasProgramControl(fileName))
                   {
                           PEG_METHOD_EXIT();
                           return 0;
                   }
           #endif
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return DynamicLibraryHandle(dllload(fileName));     return DynamicLibraryHandle(dllload(fileName));
 #elif defined(PEGASUS_OS_OS400) #elif defined(PEGASUS_OS_OS400)
Line 445 
Line 462 
     dlclose(libraryHandle);     dlclose(libraryHandle);
 #endif #endif
  
   #ifdef PEGASUS_OS_ZOS
           dllfree(reinterpret_cast<dllhandle *> (libraryHandle));
   #endif
 } }
  
 String System::dynamicLoadError() { String System::dynamicLoadError() {
Line 621 
Line 641 
     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];
     if(getpwuid_r(geteuid(), &local_pwd, buf, PWD_BUFF_SIZE, &pwd)) {  
         pwd = (struct passwd *)NULL;      if(getpwuid_r(geteuid(), &local_pwd, buf, PWD_BUFF_SIZE, &pwd) != 0)
       {
           String errorMsg = String("getpwuid_r failure : ") +
                               String(strerror(errno));
           Tracer::PEG_TRACE_STRING (TRC_OS_ABSTRACTION, Tracer::LEVEL2,
                                     errorMsg);
           // l10n TODO - Need to add this message
           //Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,
           //                          errorMsg);
           return userName;
     }     }
 #else #else
     //     //
Line 632 
Line 661 
 #endif #endif
     if ( pwd == NULL )     if ( pwd == NULL )
     {     {
         //ATTN: Log a message           // l10n TODO - Need to add this message
         // "User might have been removed just after login"           // Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,
            //    "getpwuid_r failure, user may have been removed just after login");
            Tracer::trace (TRC_OS_ABSTRACTION, Tracer::LEVEL4,
                "getpwuid_r failure, user may have been removed just after login");
     }     }
     else     else
     {     {
Line 675 
Line 707 
     char            pwdBuffer[PWD_BUFF_SIZE];     char            pwdBuffer[PWD_BUFF_SIZE];
  
     if (getpwnam_r(userName, &pwd, pwdBuffer, PWD_BUFF_SIZE, &result) != 0)     if (getpwnam_r(userName, &pwd, pwdBuffer, PWD_BUFF_SIZE, &result) != 0)
       {
           String errorMsg = String("getpwnam_r failure : ") +
                               String(strerror(errno));
           Tracer::PEG_TRACE_STRING (TRC_OS_ABSTRACTION, Tracer::LEVEL2,
                                     errorMsg);
           // l10n TODO - Need to add this message
           // Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,
           //                           errorMsg);
           return false;
       }
       if (result == NULL)
       {
           return false;
       }
 #else #else
     //     //
     //  get the password entry for the user     //  get the password entry for the user
     //     //
     if  ( getpwnam(userName) == NULL )     if  ( getpwnam(userName) == NULL )
 #endif  
     {     {
 #if defined(PEGASUS_OS_OS400) #if defined(PEGASUS_OS_OS400)
         EtoA((char *)userName);         EtoA((char *)userName);
 #endif #endif
         return false;         return false;
     }     }
   #endif
 #if defined(PEGASUS_OS_OS400) #if defined(PEGASUS_OS_OS400)
     EtoA((char *)userName);     EtoA((char *)userName);
 #endif #endif
Line 701 
Line 747 
 #if !defined(PEGASUS_OS_OS400) #if !defined(PEGASUS_OS_OS400)
     struct passwd   pwd;     struct passwd   pwd;
     struct passwd   *result;     struct passwd   *result;
     char            pwdBuffer[1024];      const unsigned int PWD_BUFF_SIZE = 1024;
       char            pwdBuffer[PWD_BUFF_SIZE];
  
     if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, 1024, &result) == 0)      if (getpwnam_r(userName.getCString(), &pwd, pwdBuffer, PWD_BUFF_SIZE, &result) != 0)
     {     {
           String errorMsg = String("getpwnam_r failure : ") +
                               String(strerror(errno));
           Tracer::PEG_TRACE_STRING (TRC_OS_ABSTRACTION, Tracer::LEVEL2,
                                     errorMsg);
           // l10n TODO - Need to add this message
           //Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,
           //                          errorMsg);
           return false;
       }
   
       // Check if the requested entry was found. If not return false.
       if ( result != NULL )
       {
           // Check if the uid is 0.
         if ( pwd.pw_uid == 0 )         if ( pwd.pw_uid == 0 )
         {         {
             return true;             return true;
         }         }
     }     }
     return false;     return false;
   
 #else #else
     CString user = userName.getCString();     CString user = userName.getCString();
     const char * tmp = (const char *)user;     const char * tmp = (const char *)user;
Line 732 
Line 794 
         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];
         if(getpwuid_r(0, &local_pwd, buf, PWD_BUFF_SIZE, &pwd)) {  
                 pwd = (struct passwd *)NULL;          if(getpwuid_r(0, &local_pwd, buf, PWD_BUFF_SIZE, &pwd) != 0)
           {
               String errorMsg = String("getpwuid_r failure : ") +
                               String(strerror(errno));
               Tracer::PEG_TRACE_STRING (TRC_OS_ABSTRACTION, Tracer::LEVEL2,
                                     errorMsg);
               // l10n TODO - Need to add this message
               // Logger::put(Logger::STANDARD_LOG, "CIMServer", Logger::WARNING,
               //                      errorMsg);
               return userName;
         }         }
 #else #else
         //         //
Line 754 
Line 825 
         }         }
         else         else
         {         {
               Tracer::trace (TRC_OS_ABSTRACTION, Tracer::LEVEL4,
                          "Could not find entry.");
             PEGASUS_ASSERT(0);             PEGASUS_ASSERT(0);
         }         }
     }     }
Line 814 
Line 887 
   return false;   return false;
 } }
  
 void System::openlog(const String ident)  // Changes file permissions on the given file.
   Boolean System::changeFilePermissions(const char* path, mode_t mode)
 { {
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)      Sint32 ret = 0;
   
       const char * tmp = path;
   
   #if defined(PEGASUS_OS_OS400)
       // ATTN: Update this code to handle UTF8 when path contains UTF8
       AtoE((char *)tmp);
   #endif
   
       ret = ::chmod(tmp, mode);
   
       return ( ret != -1 );
   }
  
   void System::openlog(const String ident)
   {
   #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)
     // ATTN: Hard-code the "cimserver" identifier until the infrastructure     // ATTN: Hard-code the "cimserver" identifier until the infrastructure
     // is set up to pass this as the "ident" string.     // is set up to pass this as the "ident" string.
     //::openlog(ident.getCString(), LOG_PID|LOG_CONS, LOG_DAEMON);     //::openlog(ident.getCString(), LOG_PID|LOG_CONS, LOG_DAEMON);
     ::openlog("cimserver", LOG_PID|LOG_CONS, LOG_DAEMON);      ::openlog("cimserver", LOG_PID, LOG_DAEMON);
  
 #endif #endif
  
Line 830 
Line 919 
  
 void System::syslog(Uint32 severity, const char *data) void System::syslog(Uint32 severity, const char *data)
 { {
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)
  
     // FUTURE-SF-P3-20020517 : Use the Syslog on HP-UX. Eventually only     // FUTURE-SF-P3-20020517 : Use the Syslog on HP-UX. Eventually only
     // certain messages will go to the Syslog and others to the     // certain messages will go to the Syslog and others to the
Line 857 
Line 946 
     {     {
  
         // turn into ycmMessage so we can put it in the job log         // turn into ycmMessage so we can put it in the job log
         ycmMessage theMessage(msgCPxDF80,  
                               CPIprefix,  
                               replacementData,  
 #pragma convert(37) #pragma convert(37)
           ycmMessage theMessage("CPIDF80",
                                     data,
                                 strlen(data),
                               "Logger",                               "Logger",
 #pragma convert(0)  
                           ycmCTLCIMID,                           ycmCTLCIMID,
                               utf8);                                    TRUE);
   #pragma convert(0)
  
         // put the message in the joblog         // put the message in the joblog
         theMessage.joblogIt(UnitOfWorkError,         theMessage.joblogIt(UnitOfWorkError,
Line 876 
Line 965 
         (severity & Logger::FATAL))         (severity & Logger::FATAL))
     {     {
         // turn into ycmMessage so we can put it in the job log         // turn into ycmMessage so we can put it in the job log
         ycmMessage theMessage(msgCPxDF82,  
                               CPDprefix,  
                               replacementData,  
 #pragma convert(37) #pragma convert(37)
           ycmMessage theMessage("CPDDF82",
                                     data,
                                 strlen(data),
                               "Logger",                               "Logger",
 #pragma convert(0)  
                           ycmCTLCIMID,                           ycmCTLCIMID,
                               utf8);                                    TRUE);
   #pragma convert(0)
         // put the message in the joblog         // put the message in the joblog
         theMessage.joblogIt(UnitOfWorkError,         theMessage.joblogIt(UnitOfWorkError,
                             ycmMessage::Diagnostic);                             ycmMessage::Diagnostic);
Line 897 
Line 985 
  
 void System::closelog() void System::closelog()
 { {
 #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_IA64_GNU)  #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)
  
     ::closelog();     ::closelog();
  

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