diff options
| author | Isaac Boukris <iboukris@gmail.com> | 2016-03-29 17:13:46 +0300 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-03-29 16:51:29 +0200 |
| commit | d5fc6e14b0b4f240b3b225487637c265471a9fc7 (patch) | |
| tree | 5d9f0520a606381977e3fd203c2212eb293587e9 /lib/vauth | |
| parent | d532645afdcdc06b504cf462b2bd1b78fa95948f (diff) | |
| download | curl-d5fc6e14b0b4f240b3b225487637c265471a9fc7.tar.gz | |
GSS: make Curl_gss_log_error more verbose
Also display the GSS_C_GSS_CODE (major code) when specified instead of
only GSS_C_MECH_CODE (minor code).
In addition, the old code was printing a colon twice after the prefix
and also miscalculated the length of the buffer in between calls to
gss_display_status (the length of ": " was missing).
Also, gss_buffer is not guaranteed to be NULL terminated and thus need
to restrict reading by its length.
Closes #738
Diffstat (limited to 'lib/vauth')
| -rw-r--r-- | lib/vauth/krb5_gssapi.c | 20 | ||||
| -rw-r--r-- | lib/vauth/spnego_gssapi.c | 7 |
2 files changed, 16 insertions, 11 deletions
diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c index 20274a02d..87accd13e 100644 --- a/lib/vauth/krb5_gssapi.c +++ b/lib/vauth/krb5_gssapi.c @@ -101,7 +101,8 @@ CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, gss_major_status = gss_import_name(&gss_minor_status, &spn_token, GSS_C_NT_HOSTBASED_SERVICE, &krb5->spn); if(GSS_ERROR(gss_major_status)) { - Curl_gss_log_error(data, gss_minor_status, "gss_import_name() failed: "); + Curl_gss_log_error(data, "gss_import_name() failed: ", + gss_major_status, gss_minor_status); free(spn); @@ -147,8 +148,8 @@ CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, if(output_token.value) gss_release_buffer(&gss_status, &output_token); - Curl_gss_log_error(data, gss_minor_status, - "gss_init_sec_context() failed: "); + Curl_gss_log_error(data, "gss_init_sec_context() failed: ", + gss_major_status, gss_minor_status); return CURLE_RECV_ERROR; } @@ -224,8 +225,8 @@ CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, &username, NULL, NULL, NULL, NULL, NULL, NULL); if(GSS_ERROR(gss_major_status)) { - Curl_gss_log_error(data, gss_minor_status, - "gss_inquire_context() failed: "); + Curl_gss_log_error(data, "gss_inquire_context() failed: ", + gss_major_status, gss_minor_status); free(chlg); @@ -236,7 +237,8 @@ CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, gss_major_status = gss_display_name(&gss_minor_status, username, &username_token, NULL); if(GSS_ERROR(gss_major_status)) { - Curl_gss_log_error(data, gss_minor_status, "gss_display_name() failed: "); + Curl_gss_log_error(data, "gss_display_name() failed: ", + gss_major_status, gss_minor_status); free(chlg); @@ -251,7 +253,8 @@ CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, gss_major_status = gss_unwrap(&gss_minor_status, krb5->context, &input_token, &output_token, NULL, &qop); if(GSS_ERROR(gss_major_status)) { - Curl_gss_log_error(data, gss_minor_status, "gss_unwrap() failed: "); + Curl_gss_log_error(data, "gss_unwrap() failed: ", + gss_major_status, gss_minor_status); gss_release_buffer(&gss_status, &username_token); free(chlg); @@ -325,7 +328,8 @@ CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, GSS_C_QOP_DEFAULT, &input_token, NULL, &output_token); if(GSS_ERROR(gss_major_status)) { - Curl_gss_log_error(data, gss_minor_status, "gss_wrap() failed: "); + Curl_gss_log_error(data, "gss_wrap() failed: ", + gss_major_status, gss_minor_status); free(message); diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index 9aa96dfdb..2f50daaa5 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -102,7 +102,8 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, GSS_C_NT_HOSTBASED_SERVICE, &nego->server_name); if(GSS_ERROR(major_status)) { - Curl_gss_log_error(data, minor_status, "gss_import_name() failed: "); + Curl_gss_log_error(data, "gss_import_name() failed: ", + major_status, minor_status); free(spn); @@ -150,8 +151,8 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, if(output_token.value) gss_release_buffer(&unused_status, &output_token); - Curl_gss_log_error(data, minor_status, - "gss_init_sec_context() failed: "); + Curl_gss_log_error(data, "gss_init_sec_context() failed: ", + major_status, minor_status); return CURLE_OUT_OF_MEMORY; } |