author | dwmw2 <dwmw2> | 2002-09-21 08:42:42 (UTC) |
---|---|---|
committer | dwmw2 <dwmw2> | 2002-09-21 08:42:42 (UTC) |
commit | 51f94f502b2b9a92d562a3ad726ad58372860c5e (patch) (unidiff) | |
tree | 3f587669a6fd91b36a68a37d1c2d3182d92eaab8 /noncore/settings/sshkeys/sshkeys.cpp | |
parent | 0bb8b359d20f7d5ead88c260c5560ab7b60358b9 (diff) | |
download | opie-51f94f502b2b9a92d562a3ad726ad58372860c5e.zip opie-51f94f502b2b9a92d562a3ad726ad58372860c5e.tar.gz opie-51f94f502b2b9a92d562a3ad726ad58372860c5e.tar.bz2 |
display stderr from ssh-add process too.
Diffstat (limited to 'noncore/settings/sshkeys/sshkeys.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index 88acf94..c5e1170 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp | |||
@@ -45,12 +45,14 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | |||
45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); | 45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); |
46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); | 46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); |
47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); | 47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); |
48 | 48 | ||
49 | connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)), | 49 | connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)), |
50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); |
51 | connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)), | ||
52 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | ||
51 | connect(&addprocess, SIGNAL(processExited(OProcess*)), | 53 | connect(&addprocess, SIGNAL(processExited(OProcess*)), |
52 | this, SLOT(ssh_add_exited(OProcess*))); | 54 | this, SLOT(ssh_add_exited(OProcess*))); |
53 | 55 | ||
54 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), | 56 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), |
55 | this, SLOT(add_text_changed(const QString&))); | 57 | this, SLOT(add_text_changed(const QString&))); |
56 | 58 | ||
@@ -84,12 +86,14 @@ void SSHKeysApp::doRefreshListButton() | |||
84 | delete(t); | 86 | delete(t); |
85 | t = next; | 87 | t = next; |
86 | } | 88 | } |
87 | 89 | ||
88 | connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), | 90 | connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), |
89 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); | 91 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); |
92 | connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), | ||
93 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | ||
90 | 94 | ||
91 | keystate = KeySize; | 95 | keystate = KeySize; |
92 | incoming_keyname=""; | 96 | incoming_keyname=""; |
93 | incoming_keysize=""; | 97 | incoming_keysize=""; |
94 | incoming_keyfingerprint=""; | 98 | incoming_keyfingerprint=""; |
95 | 99 | ||
@@ -98,13 +102,12 @@ void SSHKeysApp::doRefreshListButton() | |||
98 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); | 102 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); |
99 | if (!ret) { | 103 | if (!ret) { |
100 | log_text(tr("Error running ssh-add")); | 104 | log_text(tr("Error running ssh-add")); |
101 | return; | 105 | return; |
102 | } | 106 | } |
103 | if (sshadd_process.exitStatus() == 2) { | 107 | if (sshadd_process.exitStatus() == 2) { |
104 | log_text(tr("Connection to ssh-agent failed")); | ||
105 | setEnabled(FALSE); | 108 | setEnabled(FALSE); |
106 | } | 109 | } |
107 | } | 110 | } |
108 | 111 | ||
109 | void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen) | 112 | void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen) |
110 | { | 113 | { |
@@ -185,15 +188,14 @@ void SSHKeysApp::log_sshadd_output(OProcess *proc, char *buffer, int buflen) | |||
185 | void SSHKeysApp::ssh_add_exited(OProcess *proc) | 188 | void SSHKeysApp::ssh_add_exited(OProcess *proc) |
186 | { | 189 | { |
187 | (void)proc; | 190 | (void)proc; |
188 | 191 | ||
189 | doRefreshListButton(); | 192 | doRefreshListButton(); |
190 | setEnabled(TRUE); | 193 | setEnabled(TRUE); |
191 | if (proc->exitStatus()) { | 194 | if (proc->exitStatus() == 2) { |
192 | 195 | setEnabled(FALSE); | |
193 | log_text(QString(tr("ssh-add failed"))); | ||
194 | } | 196 | } |
195 | } | 197 | } |
196 | 198 | ||
197 | void SSHKeysApp::add_text_changed(const QString &text) | 199 | void SSHKeysApp::add_text_changed(const QString &text) |
198 | { | 200 | { |
199 | struct stat sbuf; | 201 | struct stat sbuf; |
@@ -236,12 +238,14 @@ void SSHKeysApp::log_text(const char *text) | |||
236 | void SSHKeysApp::doRemoveAllButton() | 238 | void SSHKeysApp::doRemoveAllButton() |
237 | { | 239 | { |
238 | OProcess sshadd_process; | 240 | OProcess sshadd_process; |
239 | 241 | ||
240 | connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), | 242 | connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), |
241 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 243 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); |
244 | connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), | ||
245 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | ||
242 | 246 | ||
243 | log_text(tr("Running ssh-add -D")); | 247 | log_text(tr("Running ssh-add -D")); |
244 | sshadd_process << "ssh-add" << "-D"; | 248 | sshadd_process << "ssh-add" << "-D"; |
245 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); | 249 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); |
246 | if (!ret) { | 250 | if (!ret) { |
247 | log_text(tr("Error running ssh-add")); | 251 | log_text(tr("Error running ssh-add")); |