diff options
Diffstat (limited to 'auth2-gss.c')
-rw-r--r-- | auth2-gss.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/auth2-gss.c b/auth2-gss.c index 9f76f59bd..a192d282f 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. |
5 | * | 5 | * |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions |
@@ -77,7 +77,8 @@ userauth_gsskeyex(Authctxt *authctxt) | |||
77 | /* gss_kex_context is NULL with privsep, so we can't check it here */ | 77 | /* gss_kex_context is NULL with privsep, so we can't check it here */ |
78 | if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, | 78 | if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, |
79 | &gssbuf, &mic)))) | 79 | &gssbuf, &mic)))) |
80 | authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); | 80 | authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, |
81 | authctxt->pw)); | ||
81 | 82 | ||
82 | buffer_free(&b); | 83 | buffer_free(&b); |
83 | xfree(mic.value); | 84 | xfree(mic.value); |
@@ -277,7 +278,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) | |||
277 | 278 | ||
278 | packet_check_eom(); | 279 | packet_check_eom(); |
279 | 280 | ||
280 | authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); | 281 | authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, |
282 | authctxt->pw)); | ||
281 | 283 | ||
282 | authctxt->postponed = 0; | 284 | authctxt->postponed = 0; |
283 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); | 285 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); |
@@ -312,7 +314,8 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt) | |||
312 | gssbuf.length = buffer_len(&b); | 314 | gssbuf.length = buffer_len(&b); |
313 | 315 | ||
314 | if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) | 316 | if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) |
315 | authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); | 317 | authenticated = |
318 | PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); | ||
316 | else | 319 | else |
317 | logit("GSSAPI MIC check failed"); | 320 | logit("GSSAPI MIC check failed"); |
318 | 321 | ||