aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-06-20 13:30:09 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-06-20 13:30:09 +0000
commitbd464ed9555d42533f15fe51494a8551bbaf94ac (patch)
tree38d4b522921396859060fc4c6ac63ca3f7a5c305
parent813625317c7f1058102381109f7a4a2d4b2632cc (diff)
Notes
-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 00dd887cfce1..981b18813bae 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -1604,10 +1604,8 @@ http_request(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) {
@@ -1633,10 +1631,8 @@ http_request(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) {
@@ -1645,10 +1641,8 @@ http_request(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;