(file) Return to UserFileHandler.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Security / UserManager

Diff for /pegasus/src/Pegasus/Security/UserManager/UserFileHandler.cpp between version 1.22 and 1.23

version 1.22, 2006/08/09 21:13:04 version 1.23, 2007/04/03 18:50:58
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Sushma Fernandes, Hewlett Packard Company (sushma_fernandes@hp.com)  
 //  
 // Modified By:  
 //              Amit K Arora, IBM (amita@in.ibm.com) for PEP#101  
 //              Josephine Eskaline Joyce (jojustin@in.ibm.com) for PEP#101  
 //              Josephine Eskaline Joyce (jojustin@in.ibm.com) for Bug#2486  
 //              David Dillard, VERITAS Software Corp.  
 //                  (david.dillard@veritas.com)  
 //  
 //%//////////////////////////////////////////////////////////////////////////// //%////////////////////////////////////////////////////////////////////////////
  
  
Line 57 
Line 48 
  
 #include <Pegasus/Security/UserManager/UserFileHandler.h> #include <Pegasus/Security/UserManager/UserFileHandler.h>
 #include <Pegasus/Security/UserManager/UserExceptions.h> #include <Pegasus/Security/UserManager/UserExceptions.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n  #include <Pegasus/Common/MessageLoader.h>
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
Line 206 
Line 197 
     }     }
     catch (TimeOut&)     catch (TimeOut&)
     {     {
         //l10n          throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,
         //throw PEGASUS_CIM_EXCEPTION( CIM_ERR_FAILED,              MessageLoaderParms(
         //"Timed out trying to perform requested operation."                  "Security.UserManager.UserFileHandler.TIMEOUT",
         //"Please re-try the operation again.");                  "Timed out while attempting to perform the requested "
         throw PEGASUS_CIM_EXCEPTION_L( CIM_ERR_FAILED, MessageLoaderParms("Security.UserManager.UserFileHandler.TIMEOUT",                      "operation. Try the operation again."));
                                                                         "Timed out trying to perform requested operation.Please re-try the operation again."));  
     }     }
     catch (WaitFailed&)     catch (WaitFailed&)
     {     {
     //l10n          throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,
         //throw PEGASUS_CIM_EXCEPTION( CIM_ERR_FAILED,              MessageLoaderParms(
         //"Timed out trying to perform requested operation."                  "Security.UserManager.UserFileHandler.TIMEOUT",
         //"Please re-try the operation again.");                  "Timed out while attempting to perform the requested "
         throw PEGASUS_CIM_EXCEPTION_L( CIM_ERR_FAILED, MessageLoaderParms("Security.UserManager.UserFileHandler.TIMEOUT",                      "operation. Try the operation again."));
                                                                         "Timed out trying to perform requested operation.Please re-try the operation again."));  
     }     }
     catch (Deadlock&)     catch (Deadlock&)
     {     {
     //l10n          throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,
         //throw PEGASUS_CIM_EXCEPTION( CIM_ERR_FAILED,              MessageLoaderParms(
         //"Deak lock encountered trying to perform requested operation."                  "Security.UserManager.UserFileHandler.DEADLOCK",
         //"Please re-try the operation again.");                  "Deadlock encountered while attempting to perform the "
         throw PEGASUS_CIM_EXCEPTION_L( CIM_ERR_FAILED, MessageLoaderParms("Security.UserManager.UserFileHandler.DEADLOCK",                      "requested operation.  Try the operation again."));
                                                 "Deak lock encountered trying to perform requested operation.Please re-try the operation again."));  
     }     }
  
     switch (operation)     switch (operation)
Line 253 
Line 241 
                 if (!_passwordTable.insert(userName,password))                 if (!_passwordTable.insert(userName,password))
                 {                 {
                     _mutex->unlock();                     _mutex->unlock();
                     //l10n                      Logger::put_l(
                     //Logger::put(Logger::ERROR_LOG, System::CIMSERVER,                          Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                         //Logger::SEVERE,                          "Security.UserManager.UserFileHandler."
                                         //"Error updating user information for : $0.",userName);                              "ERROR_UPDATING_USER_INFO",
                                         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER,Logger::SEVERE,                          "Error updating the user information for user $0.",
                                                 "Security.UserManager.UserFileHandler.ERROR_UPDATING_USER_INFO",                          userName);
                                                 "Error updating user information for : $0.",userName);  
                     PEG_METHOD_EXIT();                     PEG_METHOD_EXIT();
                     throw PasswordCacheError();                     throw PasswordCacheError();
                 }                 }
Line 316 
Line 303 
                             const String& password)                             const String& password)
 { {
     char        salt[3];     char        salt[3];
     String      encryptedPassword = String::EMPTY;      String encryptedPassword;
  
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::addUserEntry");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::addUserEntry");
  
Line 347 
Line 334 
              const String& newPassword )              const String& newPassword )
 { {
     char        salt[3];     char        salt[3];
     String      encryptedPassword = String::EMPTY;      String encryptedPassword;
  
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::modifyUserEntry");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::modifyUserEntry");
  
Line 428 
Line 415 
                      "UserFileHandler::verifyCIMUserPassword");                      "UserFileHandler::verifyCIMUserPassword");
  
     // Check if the user's password mathches the specified password     // Check if the user's password mathches the specified password
     String curPassword          = String::EMPTY;      String curPassword;
     String encryptedPassword    = String::EMPTY;      String encryptedPassword;
     String saltStr              = String::EMPTY;      String saltStr;
  
     // Check if the user exists in the password table     // Check if the user exists in the password table
     if ( !_passwordTable.lookup(userName,curPassword) )     if ( !_passwordTable.lookup(userName,curPassword) )

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