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

Diff for /pegasus/src/Pegasus/Common/SystemWindows.cpp between version 1.51 and 1.53

version 1.51, 2005/05/09 17:21:03 version 1.53, 2005/05/20 21:09:45
Line 60 
Line 60 
 #include <process.h> #include <process.h>
 #include <lm.h> #include <lm.h>
  
 //Bug 3076 - define these for GetUserNameEx function  #define SECURITY_WIN32
 //#define SECURITY_WIN32  #include <security.h>
 //#include <security.h>  
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 328 
Line 327 
  
 String System::getEffectiveUserName() String System::getEffectiveUserName()
 { {
     //ATTN: Proposed function for Bug 3076 - hns  #if (_MSC_VER >= 1300) || defined(PEGASUS_WINDOWS_SDK_HOME)
 /*  
           //Bug 3076 fix
         char fullUserName[UNLEN+1];         char fullUserName[UNLEN+1];
         DWORD userNameSize = sizeof(fullUserName);         DWORD userNameSize = sizeof(fullUserName);
         char computerName[MAX_COMPUTERNAME_LENGTH+1];         char computerName[MAX_COMPUTERNAME_LENGTH+1];
Line 343 
Line 343 
                 return String();                 return String();
         }         }
  
         OutputDebugString("My full name");  
         OutputDebugString(fullUserName);  
   
         char* index = strchr(fullUserName, '\\');         char* index = strchr(fullUserName, '\\');
         *index = '\0';         *index = '\0';
         strcpy(userDomain, fullUserName);         strcpy(userDomain, fullUserName);
Line 368 
Line 365 
         }         }
  
         return userId;         return userId;
 */  
   #else //original getEffectiveUserName function
   
     int retcode = 0;     int retcode = 0;
  
     // UNLEN (256) is the limit, not including null     // UNLEN (256) is the limit, not including null
Line 383 
Line 382 
     }     }
  
     return String(pUserName);     return String(pUserName);
   #endif
 } }
  
 String System::encryptPassword(const char* password, const char* salt) String System::encryptPassword(const char* password, const char* salt)
Line 844 
Line 844 
     return true;     return true;
 } }
  
 void System::openlog(const String &ident)  void System::syslog(const String& ident, Uint32 severity, const char* message)
 {  
     return;  
 }  
   
 void System::syslog(Uint32 severity, const char *data)  
 {  
     return;  
 }  
   
 void System::closelog()  
 { {
     return;      // Not implemented
 } }
  
 // System ID constants for Logger::put and Logger::trace // System ID constants for Logger::put and Logger::trace


Legend:
Removed from v.1.51  
changed lines
  Added in v.1.53

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2