diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-04-08 12:27:54 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-04-08 12:27:54 +0000 |
| commit | 9bd014ea89feec52d3e8451af6a38c405baee975 (patch) | |
| tree | ceebb5294a6a5f9fde478965f501aee38bc800ad /kde-base/kdeadmin/files | |
| parent | minor formatting fix (Bug #88316) (diff) | |
| download | gentoo-2-9bd014ea89feec52d3e8451af6a38c405baee975.tar.gz gentoo-2-9bd014ea89feec52d3e8451af6a38c405baee975.tar.bz2 gentoo-2-9bd014ea89feec52d3e8451af6a38c405baee975.zip | |
Add patch to fix /etc/passwd corruption in kuser (#87405).
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base/kdeadmin/files')
| -rw-r--r-- | kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1 | 1 | ||||
| -rw-r--r-- | kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch | 41 |
2 files changed, 42 insertions, 0 deletions
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1 b/kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1 new file mode 100644 index 000000000000..8cbd9915d983 --- /dev/null +++ b/kde-base/kdeadmin/files/digest-kdeadmin-3.4.0-r1 @@ -0,0 +1 @@ +MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785 diff --git a/kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch b/kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch new file mode 100644 index 000000000000..b73ae0b384e3 --- /dev/null +++ b/kde-base/kdeadmin/files/kdeadmin-3.4.0-kuser.patch @@ -0,0 +1,41 @@ +diff -Nur kdeadmin-3.4.0.orig/kuser/propdlg.cpp kdeadmin-3.4.0/kuser/propdlg.cpp +--- kdeadmin-3.4.0.orig/kuser/propdlg.cpp 2004-11-29 01:03:48.000000000 +0100 ++++ kdeadmin-3.4.0/kuser/propdlg.cpp 2005-04-08 14:05:03.000000000 +0200 +@@ -210,6 +210,8 @@ + connect(cbposix, SIGNAL(stateChanged(int)), this, SLOT(changed())); + connect(cbposix, SIGNAL(stateChanged(int)), this, SLOT(cbposixChanged())); + addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr); ++ } else { ++ cbposix = 0; + } + frontrow = row; + } +@@ -706,7 +708,8 @@ + bool posix, samba = false; + + newuser->copy( user ); +- if ( cbposix->state() != QButton::NoChange ) { ++ ++ if ( kug->getUsers().getCaps() & KUsers::Cap_Disable_POSIX && cbposix->state() != QButton::NoChange ) { + if ( cbposix->isChecked() ) + newuser->setCaps( newuser->getCaps() & ~KUser::Cap_POSIX ); + else +@@ -873,7 +876,7 @@ + bool propdlg::check() + { + 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() ) { + KMessageBox::sorry( 0, i18n("You need to specify an UID.") ); +@@ -928,7 +931,8 @@ + + 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)) { + KMessageBox::sorry( 0, |