diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-08 16:30:41 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-29 16:43:21 -0400 |
| commit | 80c881f7938969dab169f4fc4fbf8bc3d4355fc2 (patch) | |
| tree | 77abe643bf8fcb388056480350b99b666f543965 /Utilities/cmcurl/lib/http_negotiate.h | |
| parent | ff67d2b57946a29e18d1947efe71f26ece9e1747 (diff) | |
| parent | 3fe5d9bff98b4716e219516c30d71462495324f4 (diff) | |
| download | cmake-80c881f7938969dab169f4fc4fbf8bc3d4355fc2.tar.gz | |
Merge branch 'curl-upstream' into update-curl
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
Diffstat (limited to 'Utilities/cmcurl/lib/http_negotiate.h')
| -rw-r--r-- | Utilities/cmcurl/lib/http_negotiate.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/Utilities/cmcurl/lib/http_negotiate.h b/Utilities/cmcurl/lib/http_negotiate.h index ce0d083f91..f7efe8cdda 100644 --- a/Utilities/cmcurl/lib/http_negotiate.h +++ b/Utilities/cmcurl/lib/http_negotiate.h @@ -1,19 +1,18 @@ -#ifndef __HTTP_NEGOTIATE_H -#define __HTTP_NEGOTIATE_H - +#ifndef HEADER_CURL_HTTP_NEGOTIATE_H +#define HEADER_CURL_HTTP_NEGOTIATE_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, 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 * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -21,19 +20,23 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ -#ifdef HAVE_GSSAPI +#ifdef USE_SPNEGO /* this is for Negotiate header input */ -int Curl_input_negotiate(struct connectdata *conn, char *header); +int Curl_input_negotiate(struct connectdata *conn, bool proxy, + const char *header); /* this is for creating Negotiate header output */ -CURLcode Curl_output_negotiate(struct connectdata *conn); +CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy); void Curl_cleanup_negotiate(struct SessionHandle *data); +#ifdef USE_WINDOWS_SSPI +#define GSS_ERROR(status) (status & 0x80000000) #endif -#endif +#endif /* USE_SPNEGO */ + +#endif /* HEADER_CURL_HTTP_NEGOTIATE_H */ |