diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-11 10:55:44 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-11 11:27:21 -0400 |
| commit | 299975908ada992800791fac7f3739050e0ae2a9 (patch) | |
| tree | 38cd8fb04ce84196dfa04d514eb92649900a1bc5 /Utilities/cmcurl/lib/vauth/krb5_sspi.c | |
| parent | 5af9c8e2451afd8e63d6b05e69cd141af543a164 (diff) | |
| parent | fd7d521c9d70655618db8232d45e5aaf81700f91 (diff) | |
| download | cmake-299975908ada992800791fac7f3739050e0ae2a9.tar.gz | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2017-04-19 (d957e218)
Resolve conflicts in `CMakeLists.txt` in favor of the upstream version.
We will re-apply our logic as needed in following commits.
Diffstat (limited to 'Utilities/cmcurl/lib/vauth/krb5_sspi.c')
| -rw-r--r-- | Utilities/cmcurl/lib/vauth/krb5_sspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/vauth/krb5_sspi.c b/Utilities/cmcurl/lib/vauth/krb5_sspi.c index 151794e619..1b4cef486d 100644 --- a/Utilities/cmcurl/lib/vauth/krb5_sspi.c +++ b/Utilities/cmcurl/lib/vauth/krb5_sspi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2014 - 2016, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2014 - 2017, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -74,7 +74,7 @@ bool Curl_auth_is_gssapi_supported(void) * passdwp [in] - The user's password. * service [in] - The service type such as http, smtp, pop or imap. * host [in] - The host name. - * mutual_auth [in] - Flag specifing whether or not mutual authentication + * mutual_auth [in] - Flag specifying whether or not mutual authentication * is enabled. * chlg64 [in] - The optional base64 encoded challenge message. * krb5 [in/out] - The Kerberos 5 data struct being used and modified. |