On Sun, Nov 29, 2015 at 9:27 AM, Dag-Erling Smørgrav <d...@freebsd.org> wrote:
> Author: des
> Date: Sun Nov 29 14:26:59 2015
> New Revision: 291453
> URL: https://svnweb.freebsd.org/changeset/base/291453
>
> Log:
> Use .netrc for HTTP sites and proxies, not just FTP.
>
> PR: 193740
> Submitted by: TEUBEL György <tgyu...@gmail.com>
> MFC after: 1 week
>
> Modified:
> head/lib/libfetch/fetch.3
> head/lib/libfetch/http.c
<snip>
> Modified: head/lib/libfetch/http.c
> ==============================================================================
> --- head/lib/libfetch/http.c Sun Nov 29 13:14:45 2015 (r291452)
> +++ head/lib/libfetch/http.c Sun Nov 29 14:26:59 2015 (r291453)
> @@ -1658,6 +1658,9 @@ http_request_body(struct url *URL, const
> http_seterr(HTTP_NEED_PROXY_AUTH);
> goto ouch;
> }
> + } else if (fetch_netrc_auth(purl) == 0) {
> + aparams.user = strdup(purl->user);
> + aparams.password = strdup(purl->pwd);
> }
> http_authorize(conn, "Proxy-Authorization",
> &proxy_challenges, &aparams, url);
> @@ -1685,6 +1688,11 @@ http_request_body(struct url *URL, const
> http_seterr(HTTP_NEED_AUTH);
> goto ouch;
> }
> + } else if (fetch_netrc_auth(url) == 0) {
> + aparams.user = url->user ?
> + strdup(url->user) : strdup("");
> + aparams.password = url->pwd ?
> + strdup(url->pwd) : strdup("");
> } else if (fetchAuthMethod &&
> fetchAuthMethod(url) == 0) {
> aparams.user = strdup(url->user);
> _______________________________________________
`make buildworld` fails after this commit:
/usr/src/head/lib/libfetch/http.c:1692:25: error: address of array
'url->user' will always evaluate to 'true' [-Werro
r,-Wpointer-bool-conversion]
aparams.user = url->user ?
~~~~~^~~~ ~
/usr/src/head/lib/libfetch/http.c:1694:29: error: address of array
'url->pwd' will always evaluate to 'true' [-Werror
,-Wpointer-bool-conversion]
aparams.password = url->pwd ?
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
