Merge branch '3869_netrc_password'

* 3869_netrc_password:
  (ftpfs_correct_url_parameters): clean up always true condition.
  Ticket #3869: fix of retrieve password from .netrc.
This commit is contained in:
Andrew Borodin 2017-10-29 20:23:40 +03:00
commit cde8e194aa

View File

@ -368,7 +368,7 @@ ftpfs_correct_url_parameters (const vfs_path_element_t * velement)
path_element->user = g_strdup ("anonymous");
/* Look up password in netrc for known user */
if (ftpfs_use_netrc && path_element->user != NULL && path_element->password != NULL)
if (ftpfs_use_netrc && path_element->password == NULL)
{
char *new_user = NULL;
char *new_passwd = NULL;