summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-03-20 18:03:31 (UTC)
committer mickeyl <mickeyl>2005-03-20 18:03:31 (UTC)
commit64104e14e4026658551e7283498eafbe3855e6d5 (patch) (side-by-side diff)
tree488a9916344c2627441742ae97eebf9a18a48a86
parent20aaf67029ac50afd8af8673db24721f10fbb43e (diff)
downloadopie-64104e14e4026658551e7283498eafbe3855e6d5.zip
opie-64104e14e4026658551e7283498eafbe3855e6d5.tar.gz
opie-64104e14e4026658551e7283498eafbe3855e6d5.tar.bz2
#1560 fix opie-console picking up the wrong shell. patch courtesy Paul Eggleton (bluelightning)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/apps/opie-console/consoleconfigwidget.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4722f9b..1c4cfe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,4 +24,5 @@
* #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)
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 @@
#include <pwd.h>
#include <sys/types.h>
-
+#include <unistd.h>
#include "consoleconfigwidget.h"
@@ -72,10 +72,10 @@ void ConsoleConfigWidget::load( const Profile& prof ) {
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 ));