| 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
@@ -25,2 +25,3 @@ * #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) 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 @@ -10,3 +10,3 @@ #include <sys/types.h> - +#include <unistd.h> @@ -73,4 +73,5 @@ void ConsoleConfigWidget::load( const Profile& prof ) { char *shell = "/bin/sh"; + int uid = getuid(); - while ( (ent = getpwent()) != 0 ) { + ent = getpwuid(uid); if (ent->pw_shell != "") { @@ -78,3 +79,2 @@ void ConsoleConfigWidget::load( const Profile& prof ) { } - } |