diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /auth2-gss.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'auth2-gss.c')
-rw-r--r-- | auth2-gss.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/auth2-gss.c b/auth2-gss.c index 3289ba18e..4d468a0e8 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.8 2004/06/21 17:36:31 avsm Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.10 2005/07/17 07:17:54 djm 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. |
@@ -61,7 +61,7 @@ userauth_gssapi(Authctxt *authctxt) | |||
61 | int present; | 61 | int present; |
62 | OM_uint32 ms; | 62 | OM_uint32 ms; |
63 | u_int len; | 63 | u_int len; |
64 | char *doid = NULL; | 64 | u_char *doid = NULL; |
65 | 65 | ||
66 | if (!authctxt->valid || authctxt->user == NULL) | 66 | if (!authctxt->valid || authctxt->user == NULL) |
67 | return (0); | 67 | return (0); |
@@ -82,9 +82,8 @@ userauth_gssapi(Authctxt *authctxt) | |||
82 | present = 0; | 82 | present = 0; |
83 | doid = packet_get_string(&len); | 83 | doid = packet_get_string(&len); |
84 | 84 | ||
85 | if (len > 2 && | 85 | if (len > 2 && doid[0] == SSH_GSS_OIDTYPE && |
86 | doid[0] == SSH_GSS_OIDTYPE && | 86 | doid[1] == len - 2) { |
87 | doid[1] == len - 2) { | ||
88 | goid.elements = doid + 2; | 87 | goid.elements = doid + 2; |
89 | goid.length = len - 2; | 88 | goid.length = len - 2; |
90 | gss_test_oid_set_member(&ms, &goid, supported, | 89 | gss_test_oid_set_member(&ms, &goid, supported, |