diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-01-17 11:56:27 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-01-17 14:57:17 +0000 |
| commit | 47438daa60ccb1b6b07acd30e4fd9d0d724bbdc7 (patch) | |
| tree | c417297d41f296a111a1aeda27b781f40202b0be /lib/http.c | |
| parent | 36e6404228584370a42dd1d8012dc1902174988d (diff) | |
| download | curl-47438daa60ccb1b6b07acd30e4fd9d0d724bbdc7.tar.gz | |
http_negotiate: Return CURLcode in Curl_input_negotiate() instead of int
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/http.c b/lib/http.c index ee0a9a481..d65acacca 100644 --- a/lib/http.c +++ b/lib/http.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -834,14 +834,13 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, while(*auth) { #ifdef USE_SPNEGO if(checkprefix("Negotiate", auth)) { - int neg; *availp |= CURLAUTH_NEGOTIATE; authp->avail |= CURLAUTH_NEGOTIATE; if(authp->picked == CURLAUTH_NEGOTIATE) { if(negdata->state == GSS_AUTHSENT || negdata->state == GSS_AUTHNONE) { - neg = Curl_input_negotiate(conn, proxy, auth); - if(neg == 0) { + CURLcode result = Curl_input_negotiate(conn, proxy, auth); + if(!result) { DEBUGASSERT(!data->req.newurl); data->req.newurl = strdup(data->change.url); if(!data->req.newurl) |