View | Details | Raw Unified
Collapse All | Expand All

(-) ./kuser/propdlg.cpp (-3 / +5 lines)
 Lines 706-712   void propdlg::mergeUser( KUser *user, KU Link Here  
  bool posix, samba = false;
  bool posix, samba = false;

        
  newuser->copy( user );
  newuser->copy( user );

            

              
  if ( cbposix->state() != QButton::NoChange ) {

              

            

            

              

              
  if ( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX && cbposix->state() != QButton::NoChange ) {

            

        
    if ( cbposix->isChecked() )
    if ( cbposix->isChecked() )

        
      newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX );
      newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX );

        
    else
    else

  

    

    

       Lines 873-879
      bool propdlg::checkShell(const QString & 
    
  Link Here 
    

  

        
bool propdlg::check()
bool propdlg::check()

        
{
{

        
  bool one = ( mUsers.getFirst() == mUsers.getLast() );
  bool one = ( mUsers.getFirst() == mUsers.getLast() );

            

              
  bool posix = !( cbposix->isChecked() );

              
  bool posix = !(kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX) || !( cbposix->isChecked() );

            

        

        
  if ( one && posix && leid->text().isEmpty() ) {
  if ( one && posix && leid->text().isEmpty() ) {

        
    KMessageBox::sorry( 0, i18n("You need to specify an UID.") );
    KMessageBox::sorry( 0, i18n("You need to specify an UID.") );

  

    

    

       Lines 928-934
      void propdlg::slotOk() 
    
  Link Here 
    

  

        

        
  uid_t newuid = leid->text().toULong();
  uid_t newuid = leid->text().toULong();

        

            

              
  if ( one && !cbposix->isChecked() && olduid != newuid )

              
  if ( one && (!(kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX) || !cbposix->isChecked())

            

            

              

              
               && olduid != newuid )

            

        
  {
  {

        
    if (kug->getUsers().lookup(newuid)) {
    if (kug->getUsers().lookup(newuid)) {

        
      KMessageBox::sorry( 0,
      KMessageBox::sorry( 0,