X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/865570570435c638831294d39fbef4c2fd665727..16707d1c7eb2a7e182b5ed1f4b1f38f746a73b1a:/unix/uxgss.c

diff --git a/unix/uxgss.c b/unix/uxgss.c
index 0a9464de..7bc6dca4 100644
--- a/unix/uxgss.c
+++ b/unix/uxgss.c
@@ -1,11 +1,12 @@
+#include "putty.h"
+
+#ifndef NO_GSSAPI
+
 #include <string.h>
 #include <gssapi/gssapi.h>
-#include "putty.h"
 #include "sshgss.h"
 #include "misc.h"
 
-#ifndef NO_GSSAPI
-
 static gss_OID_desc putty_gss_mech_krb5_desc =
     { 9, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" };
 static gss_OID const putty_gss_mech_krb5 = &putty_gss_mech_krb5_desc;
@@ -46,8 +47,7 @@ Ssh_gss_stat ssh_gss_import_name(char *host,
     host_buf.length = strlen(pStr);
 
     maj_stat = gss_import_name(&min_stat, &host_buf,
-			       GSS_C_NT_HOSTBASED_SERVICE,
-			       (gss_name_t *)srv_name);
+			       GSS_C_NT_HOSTBASED_SERVICE, srv_name);
     /* Release buffer */
     sfree(pStr);
     if (maj_stat == GSS_S_COMPLETE) return SSH_GSS_OK;
@@ -78,15 +78,15 @@ Ssh_gss_stat ssh_gss_init_sec_context(Ssh_gss_ctx *ctx,
     uxctx->maj_stat = gss_init_sec_context(&uxctx->min_stat,
 					   GSS_C_NO_CREDENTIAL,
 					   &uxctx->ctx,
-					   (gss_name_t) srv_name,
+					   srv_name,
 					   (gss_OID) putty_gss_mech_krb5,
 					   GSS_C_MUTUAL_FLAG |
 					   GSS_C_INTEG_FLAG | to_deleg,
 					   0,
 					   GSS_C_NO_CHANNEL_BINDINGS,
-					   (gss_buffer_desc *)recv_tok,
+					   recv_tok,
 					   NULL,   /* ignore mech type */
-					   (gss_buffer_desc *)send_tok,
+					   send_tok,
 					   &ret_flags,
 					   NULL);  /* ignore time_rec */
   
@@ -139,7 +139,7 @@ Ssh_gss_stat ssh_gss_display_status(Ssh_gss_ctx ctx, Ssh_gss_buf *buf)
 Ssh_gss_stat ssh_gss_free_tok(Ssh_gss_buf *send_tok)
 {
     OM_uint32 min_stat,maj_stat;
-    maj_stat = gss_release_buffer(&min_stat, (gss_buffer_desc *)send_tok);
+    maj_stat = gss_release_buffer(&min_stat, send_tok);
   
     if (maj_stat == GSS_S_COMPLETE) return SSH_GSS_OK;
     return SSH_GSS_FAILURE;
@@ -164,7 +164,7 @@ Ssh_gss_stat ssh_gss_release_cred(Ssh_gss_ctx *ctx)
 Ssh_gss_stat ssh_gss_release_name(Ssh_gss_name *srv_name)
 {
     OM_uint32 min_stat,maj_stat;
-    maj_stat = gss_release_name(&min_stat, (gss_name_t *) srv_name);
+    maj_stat = gss_release_name(&min_stat, srv_name);
   
     if (maj_stat == GSS_S_COMPLETE) return SSH_GSS_OK;
     return SSH_GSS_FAILURE;
@@ -175,11 +175,7 @@ Ssh_gss_stat ssh_gss_get_mic(Ssh_gss_ctx ctx, Ssh_gss_buf *buf,
 {
     uxSsh_gss_ctx *uxctx = (uxSsh_gss_ctx *) ctx;
     if (uxctx == NULL) return SSH_GSS_FAILURE;
-    return gss_get_mic(&(uxctx->min_stat),
-		       uxctx->ctx,
-		       0,
-		       (gss_buffer_desc *)buf,
-		       (gss_buffer_desc *)hash);
+    return gss_get_mic(&(uxctx->min_stat), uxctx->ctx, 0, buf, hash);
 }
 
 Ssh_gss_stat ssh_gss_free_mic(Ssh_gss_buf *hash)