summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2014-10-21 23:18:05 +0100
committerOndrej Holy <oholy@redhat.com>2014-11-10 12:02:59 +0100
commit910bbd3c3af8deb288d0848f7c7a2fa6cd642bac (patch)
treebb3d1fae95f1fd87bfcf341b930f594f35114bb6
parent329c3ae2fb909a8ee1d0c65161c7885973a5f6ee (diff)
downloadgvfs-910bbd3c3af8deb288d0848f7c7a2fa6cd642bac.tar.gz
sftp: Retrieve the username from the secret store
Retrieve the username from the secret store rather than simply using the default username with the retrieved password. Without this, the backend does not correctly recall the login details of a non-default user when the username is not specified in the URI. E.g. if my username is "ross" and I stored the login details for "john", logging in with a URI of sftp://host/path should use john's details rather than john's password with ross as a username. If the username is specified directly, e.g. sftp://john@host/path, this already did work correctly (and should continue to). https://bugzilla.gnome.org/show_bug.cgi?id=736311
-rw-r--r--daemon/gvfsbackendsftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index a81599e2..55b2b481 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -950,7 +950,7 @@ handle_login (GVfsBackend *backend,
op_backend->port
:
0,
- NULL,
+ &new_user,
NULL,
&new_password)))
{