author | mickeyl <mickeyl> | 2005-03-20 18:03:31 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-03-20 18:03:31 (UTC) |
commit | 64104e14e4026658551e7283498eafbe3855e6d5 (patch) (unidiff) | |
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
@@ -24,4 +24,5 @@ | |||
24 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) | 24 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) |
25 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) | 25 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) |
26 | * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning) | ||
26 | * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) | 27 | * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) |
27 | * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints) | 28 | * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints) |
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 | |||
@@ -9,5 +9,5 @@ | |||
9 | #include <pwd.h> | 9 | #include <pwd.h> |
10 | #include <sys/types.h> | 10 | #include <sys/types.h> |
11 | 11 | #include <unistd.h> | |
12 | 12 | ||
13 | #include "consoleconfigwidget.h" | 13 | #include "consoleconfigwidget.h" |
@@ -72,10 +72,10 @@ void ConsoleConfigWidget::load( const Profile& prof ) { | |||
72 | struct passwd *ent = 0; | 72 | struct passwd *ent = 0; |
73 | char *shell = "/bin/sh"; | 73 | char *shell = "/bin/sh"; |
74 | int uid = getuid(); | ||
74 | 75 | ||
75 | while ( (ent = getpwent()) != 0 ) { | 76 | ent = getpwuid(uid); |
76 | if (ent->pw_shell != "") { | 77 | if (ent->pw_shell != "") { |
77 | shell = ent->pw_shell; | 78 | shell = ent->pw_shell; |
78 | } | 79 | } |
79 | } | ||
80 | 80 | ||
81 | m_cmd->setText(prof.readEntry("Command", shell )); | 81 | m_cmd->setText(prof.readEntry("Command", shell )); |