diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-05-01 03:23:51 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-05-10 11:54:10 +1000 |
| commit | 179be0f5e62f1f492462571944e45a3da660d82b (patch) | |
| tree | 354cf8effdfb0db2f3f1573bc01544a54eb8cec0 /monitor_wrap.h | |
| parent | a42d67be65b719a430b7fcaba2a4e4118382723a (diff) | |
upstream commit
prevent authorized_keys options picked up on public key
tests without a corresponding private key authentication being applied to
other authentication methods. Reported by halex@, ok markus@
Diffstat (limited to 'monitor_wrap.h')
| -rw-r--r-- | monitor_wrap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index e18784ac..de4a08f9 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.h,v 1.26 2015/02/16 22:13:32 djm Exp $ */ +/* $OpenBSD: monitor_wrap.h,v 1.27 2015/05/01 03:23:51 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -45,8 +45,8 @@ void mm_inform_authserv(char *, char *); struct passwd *mm_getpwnamallow(const char *); char *mm_auth2_read_banner(void); int mm_auth_password(struct Authctxt *, char *); -int mm_key_allowed(enum mm_keytype, char *, char *, Key *); -int mm_user_key_allowed(struct passwd *, Key *); +int mm_key_allowed(enum mm_keytype, char *, char *, Key *, int); +int mm_user_key_allowed(struct passwd *, Key *, int); int mm_hostbased_key_allowed(struct passwd *, char *, char *, Key *); int mm_auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int); |