| author | mickeyl <mickeyl> | 2005-03-20 18:03:31 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-03-20 18:03:31 (UTC) |
| commit | 64104e14e4026658551e7283498eafbe3855e6d5 (patch) (side-by-side diff) | |
| tree | 488a9916344c2627441742ae97eebf9a18a48a86 | |
| parent | 20aaf67029ac50afd8af8673db24721f10fbb43e (diff) | |
| download | opie-64104e14e4026658551e7283498eafbe3855e6d5.zip opie-64104e14e4026658551e7283498eafbe3855e6d5.tar.gz opie-64104e14e4026658551e7283498eafbe3855e6d5.tar.bz2 | |
#1560 fix opie-console picking up the wrong shell. patch courtesy Paul Eggleton (bluelightning)
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | noncore/apps/opie-console/consoleconfigwidget.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -22,8 +22,9 @@ * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke) * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) * #1558 - Fixed opie-login breaking opie startup (mickeyl) + * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning) * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints) * #1604 - Checkbook crashed on startup (drw) * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers) diff --git a/noncore/apps/opie-console/consoleconfigwidget.cpp b/noncore/apps/opie-console/consoleconfigwidget.cpp index a6ad8d2..27d9a3f 100644 --- a/noncore/apps/opie-console/consoleconfigwidget.cpp +++ b/noncore/apps/opie-console/consoleconfigwidget.cpp @@ -7,9 +7,9 @@ #include <stdio.h> #include <pwd.h> #include <sys/types.h> - +#include <unistd.h> #include "consoleconfigwidget.h" ConsoleConfigWidget::ConsoleConfigWidget( const QString& name, QWidget* parent, @@ -70,14 +70,14 @@ void ConsoleConfigWidget::load( const Profile& prof ) { * default to the users default shell */ struct passwd *ent = 0; char *shell = "/bin/sh"; + int uid = getuid(); - while ( (ent = getpwent()) != 0 ) { + ent = getpwuid(uid); if (ent->pw_shell != "") { shell = ent->pw_shell; } - } m_cmd->setText(prof.readEntry("Command", shell )); int envcount = prof.readNumEntry("EnvVars", 0); for (int i=0; i<envcount; i++) { |