Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 87405
Collapse All | Expand All

(-)./kuser/propdlg.cpp (-3 / +5 lines)
Lines 706-712 void propdlg::mergeUser( KUser *user, KU Link Here
706
  bool posix, samba = false;
706
  bool posix, samba = false;
707
707
708
  newuser->copy( user );
708
  newuser->copy( user );
709
  if ( cbposix->state() != QButton::NoChange ) {
709
710
  if ( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX && cbposix->state() != QButton::NoChange ) {
710
    if ( cbposix->isChecked() )
711
    if ( cbposix->isChecked() )
711
      newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX );
712
      newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX );
712
    else
713
    else
Lines 873-879 bool propdlg::checkShell(const QString & Link Here
873
bool propdlg::check()
874
bool propdlg::check()
874
{
875
{
875
  bool one = ( mUsers.getFirst() == mUsers.getLast() );
876
  bool one = ( mUsers.getFirst() == mUsers.getLast() );
876
  bool posix = !( cbposix->isChecked() );
877
  bool posix = !(kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX) || !( cbposix->isChecked() );
877
878
878
  if ( one && posix && leid->text().isEmpty() ) {
879
  if ( one && posix && leid->text().isEmpty() ) {
879
    KMessageBox::sorry( 0, i18n("You need to specify an UID.") );
880
    KMessageBox::sorry( 0, i18n("You need to specify an UID.") );
Lines 928-934 void propdlg::slotOk() Link Here
928
929
929
  uid_t newuid = leid->text().toULong();
930
  uid_t newuid = leid->text().toULong();
930
931
931
  if ( one && !cbposix->isChecked() && olduid != newuid )
932
  if ( one && (!(kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX) || !cbposix->isChecked())
933
               && olduid != newuid )
932
  {
934
  {
933
    if (kug->getUsers().lookup(newuid)) {
935
    if (kug->getUsers().lookup(newuid)) {
934
      KMessageBox::sorry( 0,
936
      KMessageBox::sorry( 0,

Return to bug 87405