summaryrefslogtreecommitdiff
path: root/auth2-gss.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-05-12 08:53:37 +0000
committerColin Watson <cjwatson@debian.org>2006-05-12 08:53:37 +0000
commit2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch)
treef64a4ace625514e94759878c0b94ab0a79805bbd /auth2-gss.c
parent3c190ec8e469477ea65fbf4cc83062c65c281434 (diff)
parent3e2e0ac10674d77618c4c7339e18b83ced247492 (diff)
Merge 4.3p2 to the trunk.
Diffstat (limited to 'auth2-gss.c')
-rw-r--r--auth2-gss.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/auth2-gss.c b/auth2-gss.c
index 9295d531b..a6a9c05cd 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-gss.c,v 1.10 2005/07/17 07:17:54 djm Exp $ */ 1/* $OpenBSD: auth2-gss.c,v 1.12 2005/10/13 22:24:31 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -34,7 +34,6 @@
34#include "log.h" 34#include "log.h"
35#include "dispatch.h" 35#include "dispatch.h"
36#include "servconf.h" 36#include "servconf.h"
37#include "compat.h"
38#include "packet.h" 37#include "packet.h"
39#include "monitor_wrap.h" 38#include "monitor_wrap.h"
40 39
@@ -82,7 +81,7 @@ userauth_gsskeyex(Authctxt *authctxt)
82 81
83/* 82/*
84 * We only support those mechanisms that we know about (ie ones that we know 83 * We only support those mechanisms that we know about (ie ones that we know
85 * how to check local user kuserok and the like 84 * how to check local user kuserok and the like)
86 */ 85 */
87static int 86static int
88userauth_gssapi(Authctxt *authctxt) 87userauth_gssapi(Authctxt *authctxt)
@@ -138,7 +137,7 @@ userauth_gssapi(Authctxt *authctxt)
138 return (0); 137 return (0);
139 } 138 }
140 139
141 authctxt->methoddata=(void *)ctxt; 140 authctxt->methoddata = (void *)ctxt;
142 141
143 packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE); 142 packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);
144 143