- (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from

[openssh.git] / auth2-gss.c

diff --git a/auth2-gss.c b/auth2-gss.c
index 799d3326c47a69abdd36bf96b2b970e0ea9f21d9..3289ba18eed168c978a4952cf0fda227e29fe91c 100644 (file)
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: auth2-gss.c,v 1.7 2003/11/21 11:57:03 djm Exp $       */
+/*     $OpenBSD: auth2-gss.c,v 1.8 2004/06/21 17:36:31 avsm Exp $      */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -54,7 +54,7 @@ static void input_gssapi_errtok(int, u_int32_t, void *);
 static int
 userauth_gssapi(Authctxt *authctxt)
 {
-       gss_OID_desc oid = {0, NULL};
+       gss_OID_desc goid = {0, NULL};
        Gssctxt *ctxt = NULL;
        int mechs;
        gss_OID_set supported;
@@ -85,9 +85,9 @@ userauth_gssapi(Authctxt *authctxt)
                if (len > 2 &&
                   doid[0] == SSH_GSS_OIDTYPE &&
                   doid[1] == len - 2) {
-                       oid.elements = doid + 2;
-                       oid.length   = len - 2;
-                       gss_test_oid_set_member(&ms, &oid, supported,
+                       goid.elements = doid + 2;
+                       goid.length   = len - 2;
+                       gss_test_oid_set_member(&ms, &goid, supported,
                            &present);
                } else {
                        logit("Badly formed OID received");
@@ -101,7 +101,7 @@ userauth_gssapi(Authctxt *authctxt)
                return (0);
        }
 
-       if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &oid)))) {
+       if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
                xfree(doid);
                return (0);
        }
@@ -255,21 +255,21 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
        Buffer b;
        gss_buffer_desc mic, gssbuf;
        u_int len;
-       
+
        if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
                fatal("No authentication or GSSAPI context");
-       
+
        gssctxt = authctxt->methoddata;
-       
+
        mic.value = packet_get_string(&len);
        mic.length = len;
-       
+
        ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service,
            "gssapi-with-mic");
-       
+
        gssbuf.value = buffer_ptr(&b);
        gssbuf.length = buffer_len(&b);
-       
+
        if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
                authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
        else
@@ -277,7 +277,7 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
 
        buffer_free(&b);
        xfree(mic.value);
-       
+
        authctxt->postponed = 0;
        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, NULL);