github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2025-01-27 21:00:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix previous commit 2427ca4ac0

Browse Source
This commit is contained in:
Tim Rühsen 2017-01-07 15:59:11 +01:00
parent 2427ca4ac0
commit 1a01a6b2d0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ftp.c
View File

@ -370,6 +370,7 @@ getftp (struct url *u, struct url *original_url,
user = opt.user;
else
user = NULL;
/* Find the password with priority */
if (u->passwd)
passwd = u->passwd;
@ -381,9 +382,11 @@ getftp (struct url *u, struct url *original_url,
passwd = opt.passwd;
else
passwd = NULL;
/* Check for ~/.netrc if none of the above match */
if (opt.netrc && (!user || !passwd))
search_netrc (u->host, (const char **)&user, (const char **)&passwd, 1);
search_netrc (u->host, (const char **) &user, (const char **) &passwd, 1);
if (!user) user = "anonymous";
if (!passwd) passwd = "-wget@";

6
src/http.c
View File

@ -1886,6 +1886,7 @@ initialize_request (const struct url *u, struct http_stat *hs, int *dt, struct u
*user = opt.user;
else
*user = NULL;
/* Find the password with priority */
if (u->passwd)
*passwd = u->passwd;
@ -1897,9 +1898,10 @@ initialize_request (const struct url *u, struct http_stat *hs, int *dt, struct u
*passwd = opt.passwd;
else
*passwd = NULL;
/* Check for ~/.netrc if none of the above match */
if (opt.netrc && (!(*user) || !(*password)))
search_netrc (u->host, (const char **)user, (const char **)passwd, 0);
if (opt.netrc && (!user || !passwd))
search_netrc (u->host, (const char **) user, (const char **) passwd, 0);
/* We only do "site-wide" authentication with "global" user/password
* values unless --auth-no-challange has been requested; URL user/password