summaryrefslogtreecommitdiff
path: root/lib/libfetch/http.c
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-06-13 19:26:48 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-06-13 19:26:48 +0000
commitf2c41c554db2b5c559c18e800001b859687afffa (patch)
tree85480d12259b8467b303b28b3662696e64aa9083 /lib/libfetch/http.c
parentccfb965433c67f3bda935a3cdf334be2e3c4348d (diff)
Notes
Diffstat (limited to 'lib/libfetch/http.c')
-rw-r--r--lib/libfetch/http.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index ad4a41952151..e0c297971a36 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -1625,10 +1625,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
http_auth_params_t aparams;
init_http_auth_params(&aparams);
if (*purl->user || *purl->pwd) {
- aparams.user = purl->user ?
- strdup(purl->user) : strdup("");
- aparams.password = purl->pwd?
- strdup(purl->pwd) : strdup("");
+ aparams.user = strdup(purl->user);
+ aparams.password = strdup(purl->pwd);
} else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL &&
*p != '\0') {
if (http_authfromenv(p, &aparams) < 0) {
@@ -1654,10 +1652,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
http_auth_params_t aparams;
init_http_auth_params(&aparams);
if (*url->user || *url->pwd) {
- aparams.user = url->user ?
- strdup(url->user) : strdup("");
- aparams.password = url->pwd ?
- strdup(url->pwd) : strdup("");
+ aparams.user = strdup(url->user);
+ aparams.password = strdup(url->pwd);
} else if ((p = getenv("HTTP_AUTH")) != NULL &&
*p != '\0') {
if (http_authfromenv(p, &aparams) < 0) {
@@ -1666,10 +1662,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
}
} else if (fetchAuthMethod &&
fetchAuthMethod(url) == 0) {
- aparams.user = url->user ?
- strdup(url->user) : strdup("");
- aparams.password = url->pwd ?
- strdup(url->pwd) : strdup("");
+ aparams.user = strdup(url->user);
+ aparams.password = strdup(url->pwd);
} else {
http_seterr(HTTP_NEED_AUTH);
goto ouch;