1 files changed, 14 insertions, 2 deletions

diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index cebc845..d8b1014 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -18,31 +18,43 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include "sshkeys.h"
 
 #include <qpe/qpeapplication.h>
+#include <qdir.h>
+#include <qfile.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
 using namespace Opie::Core;
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
 
 SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
     : SSHKeysBase( parent, name, fl )
 {
-    char *home = getenv("HOME");
+    /* If we had a controlling TTY, detach from it.
+       This is to ensure that SSH uses ssh-askpass */
+    int fd = open("/dev/tty", O_RDONLY);
+    if (fd != -1) {
+        ioctl(fd, TIOCNOTTY, NULL);
+        close(fd);
+    }
+
+    QCString home = QFile::encodeName( QDir::homeDirPath() );
     unsigned i;
 
     connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
     connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
     connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
 
@@ -58,13 +70,13 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
 
     if (home) {
         for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) {
             char thiskeyname[32];
 
             thiskeyname[31] = 0;
-            snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]);
+            snprintf(thiskeyname, 31, "%s/.ssh/%s", home.data(), keynames[i]);
             if (!access(thiskeyname, R_OK)) {
                 KeyFileName->insertItem(thiskeyname);
             }
         }
     }