diff options
author | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
commit | b856a4573162fbc9ddf1c38fd82b6c728c310d1b (patch) | |
tree | b2a4ad7a06e845ba72a87d2beedfbbcbb7aeb5bb /crypto/openssh/monitor_wrap.h | |
parent | 76107b08804f309434efce7480edc2bbd15e1bf7 (diff) | |
parent | f8195792ec11c7b20879183ea72e1495f0870617 (diff) | |
download | FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.zip FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.tar.gz |
Upgrade to OpenSSH 6.9p1.
Diffstat (limited to 'crypto/openssh/monitor_wrap.h')
-rw-r--r-- | crypto/openssh/monitor_wrap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/monitor_wrap.h b/crypto/openssh/monitor_wrap.h index e18784a..de4a08f 100644 --- a/crypto/openssh/monitor_wrap.h +++ b/crypto/openssh/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); |