diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2016-09-05 13:57:32 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2016-09-05 13:57:32 +0000 |
| commit | 1d97903c5bfbe267898eacdfac2b9eeb7f5745fe (patch) | |
| tree | 4ac8afd0ff950ed70482b28e004e9b2b0baec42f /usr.bin/ssh/monitor.c | |
| parent | b5ca52879fd538fd7297c5c2e4b783eeb09d1a20 (diff) | |
enforce expected request flow for GSSAPI calls; thanks to Jakub Jelen
for testing; ok markus@
Diffstat (limited to 'usr.bin/ssh/monitor.c')
| -rw-r--r-- | usr.bin/ssh/monitor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/monitor.c b/usr.bin/ssh/monitor.c index 0701b4cb41f..1b14f0433b1 100644 --- a/usr.bin/ssh/monitor.c +++ b/usr.bin/ssh/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.164 2016/08/30 07:50:21 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.165 2016/09/05 13:57:31 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -173,9 +173,9 @@ struct mon_table mon_dispatch_proto20[] = { {MONITOR_REQ_KEYVERIFY, MON_AUTH, mm_answer_keyverify}, #ifdef GSSAPI {MONITOR_REQ_GSSSETUP, MON_ISAUTH, mm_answer_gss_setup_ctx}, - {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, - {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, - {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, + {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, + {MONITOR_REQ_GSSUSEROK, MON_ONCE|MON_AUTHDECIDE, mm_answer_gss_userok}, + {MONITOR_REQ_GSSCHECKMIC, MON_ONCE, mm_answer_gss_checkmic}, #endif {0, 0, NULL} }; |