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

1 files changed, 44 insertions, 44 deletions

diff --git a/contrib/libs/curl/lib/krb5.c b/contrib/libs/curl/lib/krb5.c
index 66394f4f302..3005fda757e 100644
--- a/contrib/libs/curl/lib/krb5.c
+++ b/contrib/libs/curl/lib/krb5.c
@@ -34,7 +34,7 @@
 
 #include "curl_setup.h"
 
-#if defined(HAVE_GSSAPI) && !defined(CURL_DISABLE_FTP)
+#if defined(HAVE_GSSAPI) && !defined(CURL_DISABLE_FTP) 
 
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -51,9 +51,9 @@
 #include "strcase.h"
 #include "strdup.h"
 
-/* The last 3 #include files should be in this order */
-#include "curl_printf.h"
-#include "curl_memory.h"
+/* The last 3 #include files should be in this order */ 
+#include "curl_printf.h" 
+#include "curl_memory.h" 
 #include "memdebug.h"
 
 static CURLcode ftpsend(struct connectdata *conn, const char *cmd)
@@ -144,7 +144,7 @@ krb5_decode(void *app_data, void *buf, int len,
 
   enc.value = buf;
   enc.length = len;
-  maj = gss_unwrap(&min, *context, &enc, &dec, NULL, NULL);
+  maj = gss_unwrap(&min, *context, &enc, &dec, NULL, NULL); 
   if(maj != GSS_S_COMPLETE) {
     if(len >= 4)
       strcpy(buf, "599 ");
@@ -169,7 +169,7 @@ krb5_overhead(void *app_data, int level, int len)
 }
 
 static int
-krb5_encode(void *app_data, const void *from, int length, int level, void **to)
+krb5_encode(void *app_data, const void *from, int length, int level, void **to) 
 {
   gss_ctx_id_t *context = app_data;
   gss_buffer_desc dec, enc;
@@ -178,11 +178,11 @@ krb5_encode(void *app_data, const void *from, int length, int level, void **to)
   int len;
 
   /* NOTE that the cast is safe, neither of the krb5, gnu gss and heimdal
-   * libraries modify the input buffer in gss_wrap()
+   * libraries modify the input buffer in gss_wrap() 
    */
-  dec.value = (void *)from;
+  dec.value = (void *)from; 
   dec.length = length;
-  maj = gss_wrap(&min, *context,
+  maj = gss_wrap(&min, *context, 
                  level == PROT_PRIVATE,
                  GSS_C_QOP_DEFAULT,
                  &dec, &state, &enc);
@@ -209,32 +209,32 @@ krb5_auth(void *app_data, struct connectdata *conn)
   const char *host = conn->host.name;
   ssize_t nread;
   curl_socklen_t l = sizeof(conn->local_addr);
-  struct Curl_easy *data = conn->data;
+  struct Curl_easy *data = conn->data; 
   CURLcode result;
-  const char *service = data->set.str[STRING_SERVICE_NAME] ?
-                        data->set.str[STRING_SERVICE_NAME] :
-                        "ftp";
-  const char *srv_host = "host";
+  const char *service = data->set.str[STRING_SERVICE_NAME] ? 
+                        data->set.str[STRING_SERVICE_NAME] : 
+                        "ftp"; 
+  const char *srv_host = "host"; 
   gss_buffer_desc input_buffer, output_buffer, _gssresp, *gssresp;
   OM_uint32 maj, min;
   gss_name_t gssname;
   gss_ctx_id_t *context = app_data;
   struct gss_channel_bindings_struct chan;
   size_t base64_sz = 0;
-  struct sockaddr_in **remote_addr =
-    (struct sockaddr_in **)&conn->ip_addr->ai_addr;
-  char *stringp;
+  struct sockaddr_in **remote_addr = 
+    (struct sockaddr_in **)&conn->ip_addr->ai_addr; 
+  char *stringp; 
 
   if(getsockname(conn->sock[FIRSTSOCKET],
-                 (struct sockaddr *)&conn->local_addr, &l) < 0)
+                 (struct sockaddr *)&conn->local_addr, &l) < 0) 
     perror("getsockname()");
 
   chan.initiator_addrtype = GSS_C_AF_INET;
   chan.initiator_address.length = l - 4;
-  chan.initiator_address.value = &conn->local_addr.sin_addr.s_addr;
+  chan.initiator_address.value = &conn->local_addr.sin_addr.s_addr; 
   chan.acceptor_addrtype = GSS_C_AF_INET;
   chan.acceptor_address.length = l - 4;
-  chan.acceptor_address.value = &(*remote_addr)->sin_addr.s_addr;
+  chan.acceptor_address.value = &(*remote_addr)->sin_addr.s_addr; 
   chan.application_data.length = 0;
   chan.application_data.value = NULL;
 
@@ -245,7 +245,7 @@ krb5_auth(void *app_data, struct connectdata *conn)
       result = ftpsend(conn, "AUTH GSSAPI");
       if(result)
         return -2;
-
+ 
       if(Curl_GetFTPResponse(&nread, conn, NULL))
         return -1;
 
@@ -253,19 +253,19 @@ krb5_auth(void *app_data, struct connectdata *conn)
         return -1;
     }
 
-    stringp = aprintf("%s@%s", service, host);
-    if(!stringp)
-      return -2;
-
-    input_buffer.value = stringp;
-    input_buffer.length = strlen(stringp);
+    stringp = aprintf("%s@%s", service, host); 
+    if(!stringp) 
+      return -2; 
+ 
+    input_buffer.value = stringp; 
+    input_buffer.length = strlen(stringp); 
     maj = gss_import_name(&min, &input_buffer, GSS_C_NT_HOSTBASED_SERVICE,
                           &gssname);
-    free(stringp);
+    free(stringp); 
     if(maj != GSS_S_COMPLETE) {
       gss_release_name(&min, &gssname);
       if(service == srv_host) {
-        failf(data, "Error importing service name %s@%s", service, host);
+        failf(data, "Error importing service name %s@%s", service, host); 
         return AUTH_ERROR;
       }
       service = srv_host;
@@ -287,11 +287,11 @@ krb5_auth(void *app_data, struct connectdata *conn)
                                       &min,
                                       context,
                                       gssname,
-                                      &Curl_krb5_mech_oid,
+                                      &Curl_krb5_mech_oid, 
                                       &chan,
                                       gssresp,
                                       &output_buffer,
-                                      TRUE,
+                                      TRUE, 
                                       NULL);
 
       if(gssresp) {
@@ -306,25 +306,25 @@ krb5_auth(void *app_data, struct connectdata *conn)
       }
 
       if(output_buffer.length != 0) {
-        char *cmd;
-
+        char *cmd; 
+ 
         result = Curl_base64_encode(data, (char *)output_buffer.value,
                                     output_buffer.length, &p, &base64_sz);
         if(result) {
-          Curl_infof(data, "base64-encoding: %s\n",
-                     curl_easy_strerror(result));
-          ret = AUTH_ERROR;
+          Curl_infof(data, "base64-encoding: %s\n", 
+                     curl_easy_strerror(result)); 
+          ret = AUTH_ERROR; 
           break;
         }
 
-        cmd = aprintf("ADAT %s", p);
-        if(cmd)
+        cmd = aprintf("ADAT %s", p); 
+        if(cmd) 
           result = ftpsend(conn, cmd);
-        else
-          result = CURLE_OUT_OF_MEMORY;
+        else 
+          result = CURLE_OUT_OF_MEMORY; 
 
         free(p);
-        free(cmd);
+        free(cmd); 
 
         if(result) {
           ret = -2;
@@ -342,7 +342,7 @@ krb5_auth(void *app_data, struct connectdata *conn)
           break;
         }
 
-        _gssresp.value = NULL; /* make sure it is initialized */
+        _gssresp.value = NULL; /* make sure it is initialized */ 
         p = data->state.buffer + 4;
         p = strstr(p, "ADAT=");
         if(p) {
@@ -350,7 +350,7 @@ krb5_auth(void *app_data, struct connectdata *conn)
                                       (unsigned char **)&_gssresp.value,
                                       &_gssresp.length);
           if(result) {
-            failf(data, "base64-decoding: %s", curl_easy_strerror(result));
+            failf(data, "base64-decoding: %s", curl_easy_strerror(result)); 
             ret = AUTH_CONTINUE;
             break;
           }
@@ -905,4 +905,4 @@ Curl_sec_end(struct connectdata *conn)
   conn->mech = NULL;
 }
 
-#endif /* HAVE_GSSAPI && !CURL_DISABLE_FTP */
+#endif /* HAVE_GSSAPI && !CURL_DISABLE_FTP */