Restoring authorship annotation for <deshevoy@yandex-team.ru>. Commit 1 of 2.

1 files changed, 73 insertions, 73 deletions

diff --git a/contrib/libs/curl/lib/curl_gssapi.c b/contrib/libs/curl/lib/curl_gssapi.c
index f72430b26f..fdae69e882 100644
--- a/contrib/libs/curl/lib/curl_gssapi.c
+++ b/contrib/libs/curl/lib/curl_gssapi.c
@@ -27,33 +27,33 @@
 #include "curl_gssapi.h"
 #include "sendf.h"
 
-/* The last 3 #include files should be in this order */
-#include "curl_printf.h"
-#include "curl_memory.h"
-#include "memdebug.h"
-
-static char spnego_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02";
-gss_OID_desc Curl_spnego_mech_oid = { 6, &spnego_oid_bytes };
-static char krb5_oid_bytes[] = "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02";
-gss_OID_desc Curl_krb5_mech_oid = { 9, &krb5_oid_bytes };
-
+/* The last 3 #include files should be in this order */ 
+#include "curl_printf.h" 
+#include "curl_memory.h" 
+#include "memdebug.h" 
+ 
+static char spnego_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02"; 
+gss_OID_desc Curl_spnego_mech_oid = { 6, &spnego_oid_bytes }; 
+static char krb5_oid_bytes[] = "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"; 
+gss_OID_desc Curl_krb5_mech_oid = { 9, &krb5_oid_bytes }; 
+ 
 OM_uint32 Curl_gss_init_sec_context(
-    struct Curl_easy *data,
-    OM_uint32 *minor_status,
-    gss_ctx_id_t *context,
+    struct Curl_easy *data, 
+    OM_uint32 *minor_status, 
+    gss_ctx_id_t *context, 
     gss_name_t target_name,
-    gss_OID mech_type,
+    gss_OID mech_type, 
     gss_channel_bindings_t input_chan_bindings,
     gss_buffer_t input_token,
     gss_buffer_t output_token,
-    const bool mutual_auth,
-    OM_uint32 *ret_flags)
+    const bool mutual_auth, 
+    OM_uint32 *ret_flags) 
 {
-  OM_uint32 req_flags = GSS_C_REPLAY_FLAG;
-
-  if(mutual_auth)
-    req_flags |= GSS_C_MUTUAL_FLAG;
+  OM_uint32 req_flags = GSS_C_REPLAY_FLAG; 
 
+  if(mutual_auth) 
+    req_flags |= GSS_C_MUTUAL_FLAG; 
+ 
   if(data->set.gssapi_delegation & CURLGSSAPI_DELEGATION_POLICY_FLAG) {
 #ifdef GSS_C_DELEG_POLICY_FLAG
     req_flags |= GSS_C_DELEG_POLICY_FLAG;
@@ -70,7 +70,7 @@ OM_uint32 Curl_gss_init_sec_context(
                               GSS_C_NO_CREDENTIAL, /* cred_handle */
                               context,
                               target_name,
-                              mech_type,
+                              mech_type, 
                               req_flags,
                               0, /* time_req */
                               input_chan_bindings,
@@ -81,56 +81,56 @@ OM_uint32 Curl_gss_init_sec_context(
                               NULL /* time_rec */);
 }
 
-#define GSS_LOG_BUFFER_LEN 1024
-static size_t display_gss_error(OM_uint32 status, int type,
-                                char *buf, size_t len) {
-  OM_uint32 maj_stat;
-  OM_uint32 min_stat;
-  OM_uint32 msg_ctx = 0;
-  gss_buffer_desc status_string;
-
-  do {
-    maj_stat = gss_display_status(&min_stat,
-                                  status,
-                                  type,
-                                  GSS_C_NO_OID,
-                                  &msg_ctx,
-                                  &status_string);
-    if(GSS_LOG_BUFFER_LEN > len + status_string.length + 3) {
-      len += msnprintf(buf + len, GSS_LOG_BUFFER_LEN - len,
-                       "%.*s. ", (int)status_string.length,
-                       (char *)status_string.value);
-    }
-    gss_release_buffer(&min_stat, &status_string);
-  } while(!GSS_ERROR(maj_stat) && msg_ctx != 0);
-
-  return len;
-}
-
-/*
- * Curl_gss_log_error()
- *
- * This is used to log a GSS-API error status.
- *
- * Parameters:
- *
- * data    [in] - The session handle.
- * prefix  [in] - The prefix of the log message.
- * major   [in] - The major status code.
- * minor   [in] - The minor status code.
- */
-void Curl_gss_log_error(struct Curl_easy *data, const char *prefix,
-                        OM_uint32 major, OM_uint32 minor)
-{
-  char buf[GSS_LOG_BUFFER_LEN];
-  size_t len = 0;
-
-  if(major != GSS_S_FAILURE)
-    len = display_gss_error(major, GSS_C_GSS_CODE, buf, len);
-
-  display_gss_error(minor, GSS_C_MECH_CODE, buf, len);
-
-  infof(data, "%s%s\n", prefix, buf);
-}
-
+#define GSS_LOG_BUFFER_LEN 1024 
+static size_t display_gss_error(OM_uint32 status, int type, 
+                                char *buf, size_t len) { 
+  OM_uint32 maj_stat; 
+  OM_uint32 min_stat; 
+  OM_uint32 msg_ctx = 0; 
+  gss_buffer_desc status_string; 
+ 
+  do { 
+    maj_stat = gss_display_status(&min_stat, 
+                                  status, 
+                                  type, 
+                                  GSS_C_NO_OID, 
+                                  &msg_ctx, 
+                                  &status_string); 
+    if(GSS_LOG_BUFFER_LEN > len + status_string.length + 3) { 
+      len += msnprintf(buf + len, GSS_LOG_BUFFER_LEN - len, 
+                       "%.*s. ", (int)status_string.length, 
+                       (char *)status_string.value); 
+    } 
+    gss_release_buffer(&min_stat, &status_string); 
+  } while(!GSS_ERROR(maj_stat) && msg_ctx != 0); 
+ 
+  return len; 
+} 
+ 
+/* 
+ * Curl_gss_log_error() 
+ * 
+ * This is used to log a GSS-API error status. 
+ * 
+ * Parameters: 
+ * 
+ * data    [in] - The session handle. 
+ * prefix  [in] - The prefix of the log message. 
+ * major   [in] - The major status code. 
+ * minor   [in] - The minor status code. 
+ */ 
+void Curl_gss_log_error(struct Curl_easy *data, const char *prefix, 
+                        OM_uint32 major, OM_uint32 minor) 
+{ 
+  char buf[GSS_LOG_BUFFER_LEN]; 
+  size_t len = 0; 
+ 
+  if(major != GSS_S_FAILURE) 
+    len = display_gss_error(major, GSS_C_GSS_CODE, buf, len); 
+ 
+  display_gss_error(minor, GSS_C_MECH_CODE, buf, len); 
+ 
+  infof(data, "%s%s\n", prefix, buf); 
+} 
+ 
 #endif /* HAVE_GSSAPI */