summaryrefslogtreecommitdiff
path: root/daemon/gvfsbackendftp.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2009-12-20 23:14:09 +0100
committerBenjamin Otte <otte@gnome.org>2009-12-20 23:14:09 +0100
commit9fc5ee1a8b0d6719ebc8f7e35687636ac4bb032c (patch)
tree4632be37f428dec652ae0340b212f573c5ec4a04 /daemon/gvfsbackendftp.c
parent36f0fa230827076276d6cfd88cc6423f4c5a9956 (diff)
downloadgvfs-9fc5ee1a8b0d6719ebc8f7e35687636ac4bb032c.tar.gz
Handle the case where gnome-keyring has no password or no username
Just ignore the keyring then.
Diffstat (limited to 'daemon/gvfsbackendftp.c')
-rw-r--r--daemon/gvfsbackendftp.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index 1b48fb0a..cf33d107 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -365,11 +365,17 @@ do_mount (GVfsBackend *backend,
port == 21 ? 0 : port,
&username,
NULL,
- &password))
+ &password) &&
+ username != NULL &&
+ password != NULL)
{
anonymous = FALSE;
goto try_login;
}
+ g_free (username);
+ g_free (password);
+ username = NULL;
+ password = NULL;
while (TRUE)
{