diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | daemon/gvfsbackendsftp.c | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2009-03-10 Alexander Larsson <alexl@redhat.com> + + * daemon/gvfsbackendsftp.c: + (handle_login): + Don't ask for username when getting ssh key passphrase + 2009-03-09 Alexander Larsson <alexl@redhat.com> Bug 543064 – configure script does not pick up giomoduledir diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c index e0be27b9..253277ab 100644 --- a/daemon/gvfsbackendsftp.c +++ b/daemon/gvfsbackendsftp.c @@ -851,13 +851,14 @@ handle_login (GVfsBackend *backend, if (g_vfs_keyring_is_available ()) flags |= G_ASK_PASSWORD_SAVING_SUPPORTED; - if (!op_backend->user_specified) + if (strcmp (authtype, "password") == 0 && + !op_backend->user_specified) flags |= G_ASK_PASSWORD_NEED_USERNAME; g_free (new_password); if (!g_mount_source_ask_password (mount_source, - g_str_has_prefix (buffer, "Enter passphrase for key") ? + strcmp (authtype, "publickey") == 0 ? _("Enter passphrase for key") : _("Enter password"), |