import openssh-4.3p2-gsskex-20060223.patch

1 files changed, 15 insertions, 19 deletions

diff --git a/gss-serv.c b/gss-serv.c
index 05ae54e97..190f56fc0 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: gss-serv.c,v 1.8 2005/08/30 22:08:05 djm Exp $        */
+/*      $OpenBSD: gss-serv.c,v 1.13 2005/10/13 22:24:31 stevesk Exp $   */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -29,20 +29,17 @@
 #ifdef GSSAPI
 
 #include "bufaux.h"
-#include "compat.h"
 #include "auth.h"
 #include "log.h"
 #include "channels.h"
 #include "session.h"
 #include "servconf.h"
-#include "monitor_wrap.h"
 #include "xmalloc.h"
 #include "getput.h"
+#include "monitor_wrap.h"
 
 #include "ssh-gss.h"
 
-extern ServerOptions options;
-
 static ssh_gssapi_client gssapi_client =
     { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
     GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}};
@@ -61,7 +58,7 @@ ssh_gssapi_mech* supported_mechs[]= {
         &gssapi_null_mech,
 };
 
-/* Unpriviledged */
+/* Unprivileged */
 char *
 ssh_gssapi_server_mechanisms() {
         gss_OID_set     supported;
@@ -71,19 +68,19 @@ ssh_gssapi_server_mechanisms() {
             NULL));
 }
 
-/* Unpriviledged */
+/* Unprivileged */
 int
 ssh_gssapi_server_check_mech(gss_OID oid, void *data) {
-        Gssctxt * ctx = NULL;
+        Gssctxt * ctx = NULL;
         int res;
-
+ 
         res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
         ssh_gssapi_delete_ctx(&ctx);
 
         return (res);
 }
 
-/* Unpriviledged */
+/* Unprivileged */
 void
 ssh_gssapi_supported_oids(gss_OID_set *oidset)
 {
@@ -112,7 +109,7 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
  *    oid
  *    credentials       (from ssh_gssapi_acquire_cred)
  */
-/* Priviledged */
+/* Privileged */
 OM_uint32
 ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *recv_tok,
     gss_buffer_desc *send_tok, OM_uint32 *flags)
@@ -160,14 +157,14 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
         OM_uint32 offset;
         OM_uint32 oidl;
 
-        tok=ename->value;
+        tok = ename->value;
 
         /*
          * Check that ename is long enough for all of the fixed length
          * header, and that the initial ID bytes are correct
          */
 
-        if (ename->length<6 || memcmp(tok,"\x04\x01", 2)!=0)
+        if (ename->length < 6 || memcmp(tok, "\x04\x01", 2) != 0)
                 return GSS_S_FAILURE;
 
         /*
@@ -186,7 +183,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
          */
         if (tok[4] != 0x06 || tok[5] != oidl ||
             ename->length < oidl+6 ||
-            !ssh_gssapi_check_oid(ctx,tok+6,oidl))
+            !ssh_gssapi_check_oid(ctx, tok+6, oidl))
                 return GSS_S_FAILURE;
 
         offset = oidl+6;
@@ -201,7 +198,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
                 return GSS_S_FAILURE;
 
         name->value = xmalloc(name->length+1);
-        memcpy(name->value,tok+offset,name->length);
+        memcpy(name->value, tok+offset,name->length);
         ((char *)name->value)[name->length] = 0;
 
         return GSS_S_COMPLETE;
@@ -210,7 +207,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
 /* Extract the client details from a given context. This can only reliably
  * be called once for a context */
 
-/* Priviledged (called from accept_secure_ctx) */
+/* Privileged (called from accept_secure_ctx) */
 OM_uint32
 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
 {
@@ -285,15 +282,14 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
 
         if (gssapi_client.store.envvar != NULL &&
             gssapi_client.store.envval != NULL) {
-
                 debug("Setting %s to %s", gssapi_client.store.envvar,
-                gssapi_client.store.envval);
+                    gssapi_client.store.envval);
                 child_set_env(envp, envsizep, gssapi_client.store.envvar,
                     gssapi_client.store.envval);
         }
 }
 
-/* Priviledged */
+/* Privileged */
 int
 ssh_gssapi_userok(char *user)
 {