d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hook in the .netrc code + don't use pointers as if they were booleans.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2003-01-22 17:54:49 +00:00
parent caf3197636
commit 9f808a4dd0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libfetch/ftp.c
View File

@ -730,10 +730,12 @@ _ftp_authenticate(conn_t *conn, struct url *url, struct url *purl)
/* XXX FTP_AUTH, and maybe .netrc */
/* send user name and password */
if (url->user[0] == '\0')
_fetch_netrc_auth(url);
user = url->user;
if (!user || !*user)
if (*user == '\0')
user = getenv("FTP_LOGIN");
if (!user || !*user)
if (user == NULL || *user == '\0')
user = FTP_ANONYMOUS_USER;
if (purl && url->port == _fetch_default_port(url->scheme))
e = _ftp_cmd(conn, "USER %s@%s", user, url->host);
@ -745,9 +747,9 @@ _ftp_authenticate(conn_t *conn, struct url *url, struct url *purl)
/* did the server request a password? */
if (e == FTP_NEED_PASSWORD) {
pwd = url->pwd;
if (!pwd || !*pwd)
if (*pwd == '\0')
pwd = getenv("FTP_PASSWORD");
if (!pwd || !*pwd) {
if (pwd == NULL || *pwd == '\0') {
if ((logname = getlogin()) == 0)
logname = FTP_ANONYMOUS_USER;
if ((len = snprintf(pbuf, MAXLOGNAME + 1, "%s@", logname)) < 0)