diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-06-15 18:08:25 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-06-15 18:12:11 +0200 |
| commit | f5ba85daddfc2da6a8dab6038269e02c0695be44 (patch) | |
| tree | 061bb6220f9ea7a836411cdb095d3d697fea248a /monitor_wrap.h | |
| parent | upstream: move auth_openprincipals() and auth_openkeyfile() over to (diff) | |
| download | openssh-f5ba85daddfc2da6a8dab6038269e02c0695be44.tar.xz openssh-f5ba85daddfc2da6a8dab6038269e02c0695be44.zip | |
upstream: make sure that UseDNS hostname lookup happens in the monitor
and not in the pledge(2)'d unprivileged process; fixes regression caused by
recent refactoring spotted by henning@
OpenBSD-Commit-ID: a089870b95101cd8881a2dff65b2f1627d13e88d
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 c5a75b9a3..0df49c25b 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.h,v 1.48 2022/05/27 05:01:25 djm Exp $ */ +/* $OpenBSD: monitor_wrap.h,v 1.49 2022/06/15 16:08:25 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> @@ -54,8 +54,8 @@ char *mm_auth2_read_banner(void); int mm_auth_password(struct ssh *, char *); int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, int, struct sshauthopt **); -int mm_user_key_allowed(struct passwd *, struct sshkey *, int, - const char *, const char *, struct sshauthopt **); +int mm_user_key_allowed(struct ssh *ssh, struct passwd *, struct sshkey *, int, + struct sshauthopt **); int mm_hostbased_key_allowed(struct ssh *, struct passwd *, const char *, const char *, struct sshkey *); int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t, |