Autoconfiscate GSS-API support, including support for manually disabling it.

[u/mdw/putty] / unix / uxgss.c

diff --git a/unix/uxgss.c b/unix/uxgss.c
index 5e59ed7..1a6668e 100644 (file)
--- a/unix/uxgss.c
+++ b/unix/uxgss.c
@@ -1,10 +1,15 @@
-#ifndef NO_GSSAPI
-
 #include <string.h>
-#include <gssapi/gssapi_krb5.h>
+#include <gssapi/gssapi.h>
+#include "putty.h"
 #include "sshgss.h"
 #include "misc.h"
 
+#ifndef NO_GSSAPI
+
+static gss_OID_desc gss_mech_krb5_desc =
+    { 9, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" };
+static gss_OID const gss_mech_krb5 = &gss_mech_krb5_desc;
+
 typedef struct uxSsh_gss_ctx {
     OM_uint32 maj_stat;
     OM_uint32 min_stat;
@@ -159,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, (gss_name_t *) srv_name);
   
     if (maj_stat == GSS_S_COMPLETE) return SSH_GSS_OK;
     return SSH_GSS_FAILURE;