diff options
author | Damien Miller <djm@mindrot.org> | 2012-12-03 09:53:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-12-03 09:53:20 +1100 |
commit | 15b05cfa17592da7470d7bd4b2de063188697471 (patch) | |
tree | 50686085795dc25237f6aabe4c2a5963f38a6e06 /auth.h | |
parent | aa5b3f831417bac9538d2b6f21d55fef278e8926 (diff) |
- djm@cvs.openbsd.org 2012/12/02 20:34:10
[auth.c auth.h auth1.c auth2-chall.c auth2-gss.c auth2-jpake.c auth2.c]
[monitor.c monitor.h]
Fixes logging of partial authentication when privsep is enabled
Previously, we recorded "Failed xxx" since we reset authenticated before
calling auth_log() in auth2.c. This adds an explcit "Partial" state.
Add a "submethod" to auth_log() to report which submethod is used
for keyboard-interactive.
Fix multiple authentication when one of the methods is
keyboard-interactive.
ok markus@
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.71 2012/11/04 11:09:15 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.72 2012/12/02 20:34:09 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -148,10 +148,12 @@ void disable_forwarding(void); | |||
148 | void do_authentication(Authctxt *); | 148 | void do_authentication(Authctxt *); |
149 | void do_authentication2(Authctxt *); | 149 | void do_authentication2(Authctxt *); |
150 | 150 | ||
151 | void auth_log(Authctxt *, int, char *, char *); | 151 | void auth_log(Authctxt *, int, int, const char *, const char *, |
152 | void userauth_finish(Authctxt *, int, char *); | 152 | const char *); |
153 | void userauth_finish(Authctxt *, int, const char *, const char *); | ||
154 | int auth_root_allowed(const char *); | ||
155 | |||
153 | void userauth_send_banner(const char *); | 156 | void userauth_send_banner(const char *); |
154 | int auth_root_allowed(char *); | ||
155 | 157 | ||
156 | char *auth2_read_banner(void); | 158 | char *auth2_read_banner(void); |
157 | int auth2_methods_valid(const char *, int); | 159 | int auth2_methods_valid(const char *, int); |