Merge pull request #4831 from Vrihub/3869_ftp

Ticket #3869: actually use the .netrc password for ftp vfs

Author: zyv

src/vfs/ftpfs/ftpfs.c

@@ -371,12 +371,13 @@ ftpfs_correct_url_parameters (const vfs_path_element_t *velement)
 
         ftpfs_netrc_lookup (path_element->host, &new_user, &new_passwd);
 
-        // If user is different, remove password
-        if (new_user != NULL && strcmp (path_element->user, new_user) != 0)
-            MC_PTR_FREE (path_element->password);
+        // Use the password if it matches the user
+        if (new_user != NULL && strcmp (path_element->user, new_user) == 0)
+            path_element->password = new_passwd;
+        else
+            g_free (new_passwd);
 
         g_free (new_user);
-        g_free (new_passwd);
     }
 
     return path_element;