diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 09:46:51 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 09:46:51 +0000 |
commit | 2a3e00306c9b3b4db71a777a7c3ccb70e470c675 (patch) | |
tree | f00af0128b0ac750d739384f111000c1c97007e4 /gss-serv.c | |
parent | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (diff) |
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
(closes: #352042).
Diffstat (limited to 'gss-serv.c')
-rw-r--r-- | gss-serv.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gss-serv.c b/gss-serv.c index 9682fc3c3..190f56fc0 100644 --- a/gss-serv.c +++ b/gss-serv.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "servconf.h" | 36 | #include "servconf.h" |
37 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
38 | #include "getput.h" | 38 | #include "getput.h" |
39 | #include "monitor_wrap.h" | ||
39 | 40 | ||
40 | #include "ssh-gss.h" | 41 | #include "ssh-gss.h" |
41 | 42 | ||
@@ -70,9 +71,9 @@ ssh_gssapi_server_mechanisms() { | |||
70 | /* Unprivileged */ | 71 | /* Unprivileged */ |
71 | int | 72 | int |
72 | ssh_gssapi_server_check_mech(gss_OID oid, void *data) { | 73 | ssh_gssapi_server_check_mech(gss_OID oid, void *data) { |
73 | Gssctxt * ctx = NULL; | 74 | Gssctxt * ctx = NULL; |
74 | int res; | 75 | int res; |
75 | 76 | ||
76 | res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); | 77 | res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); |
77 | ssh_gssapi_delete_ctx(&ctx); | 78 | ssh_gssapi_delete_ctx(&ctx); |
78 | 79 | ||
@@ -315,14 +316,4 @@ ssh_gssapi_userok(char *user) | |||
315 | return (0); | 316 | return (0); |
316 | } | 317 | } |
317 | 318 | ||
318 | /* Privileged */ | ||
319 | OM_uint32 | ||
320 | ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) | ||
321 | { | ||
322 | ctx->major = gss_verify_mic(&ctx->minor, ctx->context, | ||
323 | gssbuf, gssmic, NULL); | ||
324 | |||
325 | return (ctx->major); | ||
326 | } | ||
327 | |||
328 | #endif | 319 | #endif |