summaryrefslogtreecommitdiffstats
path: root/lib/libfetch
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-11-29 22:37:48 +0000
committerdim <dim@FreeBSD.org>2015-11-29 22:37:48 +0000
commitfbecea9b07411e37d4f13a56678d515262611a24 (patch)
treef663f4d875d17c098106de41ecea6adf8dffb96d /lib/libfetch
parent6f0b4b3366b2f6b2fe1ba4c0f7f4ac0c2da3e8b7 (diff)
downloadFreeBSD-src-fbecea9b07411e37d4f13a56678d515262611a24.zip
FreeBSD-src-fbecea9b07411e37d4f13a56678d515262611a24.tar.gz
Fix buildworld after r291453, similar to r284346: url->user and url->pwd
are arrays, so they can never be NULL. Reported by: many Pointy hat to: des
Diffstat (limited to 'lib/libfetch')
-rw-r--r--lib/libfetch/http.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index f678b36..51cac70 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -1689,10 +1689,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,
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("");
+ aparams.user = strdup(url->user);
+ aparams.password = strdup(url->pwd);
} else if (fetchAuthMethod &&
fetchAuthMethod(url) == 0) {
aparams.user = strdup(url->user);
OpenPOWER on IntegriCloud