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

Diff for /pegasus/src/Pegasus/Security/UserManager/UserManager.cpp between version 1.6 and 1.9

version 1.6, 2002/04/20 21:15:31 version 1.9, 2002/08/29 00:27:52
Line 1 
Line 1 
 //%////////////////////////////////////////////////////////////////////////////  //%/////////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,
 // The Open Group, Tivoli Systems // The Open Group, Tivoli Systems
 // //
 // 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
Line 19 
Line 19 
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 //=============================================================================  //==============================================================================
 // //
 // Author: Sushma Fernandes, Hewlett Packard Company (sushma_fernandes@hp.com) // Author: Sushma Fernandes, Hewlett Packard Company (sushma_fernandes@hp.com)
 // //
Line 62 
Line 62 
     try     try
     {     {
         _userFileHandler = 0;         _userFileHandler = 0;
         _userFileHandler = new UserFileHandler();  
  
   #ifndef PEGASUS_NO_PASSWORDFILE
           _userFileHandler = new UserFileHandler();
   #endif
         _authHandler = 0;         _authHandler = 0;
         _authHandler = new AuthorizationHandler(repository);         _authHandler = new AuthorizationHandler(repository);
     }     }
Line 135 
Line 137 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::addUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::addUser");
  
   #ifndef PEGASUS_NO_PASSWORDFILE
     //     //
     // Check if the user is a valid system user     // Check if the user is a valid system user
     //     //
     ArrayDestroyer<char> un(userName.allocateCString());      if ( !System::isSystemUser( userName.getCString() ) )
     if ( !System::isSystemUser( un.getPointer() ) )  
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw InvalidSystemUser(userName);         throw InvalidSystemUser(userName);
Line 157 
Line 159 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw e;         throw e;
     }     }
   #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 171 
Line 174 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::modifyUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::modifyUser");
  
   #ifndef PEGASUS_NO_PASSWORDFILE
     try     try
     {     {
         _userFileHandler->modifyUserEntry(userName, password, newPassword);         _userFileHandler->modifyUserEntry(userName, password, newPassword);
Line 180 
Line 184 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw e;         throw e;
     }     }
   #endif
   
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 189 
Line 195 
 void UserManager::removeUser(const String& userName) void UserManager::removeUser(const String& userName)
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::removeUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::removeUser");
   
   #ifndef PEGASUS_NO_PASSWORDFILE
     try     try
     {     {
         _userFileHandler->removeUserEntry(userName);         _userFileHandler->removeUserEntry(userName);
Line 198 
Line 206 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw e;         throw e;
     }     }
   #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 210 
Line 219 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::getAllUserNames");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::getAllUserNames");
  
   #ifndef PEGASUS_NO_PASSWORDFILE
     try     try
     {     {
         _userFileHandler->getAllUserNames( userNames );         _userFileHandler->getAllUserNames( userNames );
Line 219 
Line 229 
     {     {
         throw e;         throw e;
     }     }
   #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 230 
Line 241 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUser");
  
   #ifndef PEGASUS_NO_PASSWORDFILE
     try     try
     {     {
         if ( _userFileHandler->verifyCIMUser( userName ))         if ( _userFileHandler->verifyCIMUser( userName ))
Line 253 
Line 265 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw e;         throw e;
     }     }
   #else
       PEG_METHOD_EXIT();
       return false;
   #endif
 } }
  
 // //
Line 264 
Line 280 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUserPassword");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUserPassword");
  
   #ifndef PEGASUS_NO_PASSWORDFILE
     try     try
     {     {
         if ( _userFileHandler->verifyCIMUserPassword( userName, password ))         if ( _userFileHandler->verifyCIMUserPassword( userName, password ))
Line 287 
Line 304 
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         throw e;         throw e;
     }     }
   #else
       PEG_METHOD_EXIT();
       return false;
   #endif
 } }
  
 // //

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