diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-06-15 16:08:25 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-06-16 02:12:11 +1000 |
| commit | f5ba85daddfc2da6a8dab6038269e02c0695be44 (patch) | |
| tree | 061bb6220f9ea7a836411cdb095d3d697fea248a /monitor_wrap.c | |
| parent | acb2059febaddd71ee06c2ebf63dcf211d9ab9f2 (diff) | |
| download | openssh-git-f5ba85daddfc2da6a8dab6038269e02c0695be44.tar.gz | |
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.c')
| -rw-r--r-- | monitor_wrap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 925985a8..b2c85205 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.124 2022/05/27 05:01:25 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.125 2022/06/15 16:08:25 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -434,9 +434,8 @@ mm_auth_password(struct ssh *ssh, char *password) } int -mm_user_key_allowed(struct passwd *pw, struct sshkey *key, - int pubkey_auth_attempt, const char *remote_ip, const char *remote_host, - struct sshauthopt **authoptp) +mm_user_key_allowed(struct ssh *ssh, struct passwd *pw, struct sshkey *key, + int pubkey_auth_attempt, struct sshauthopt **authoptp) { return (mm_key_allowed(MM_USERKEY, NULL, NULL, key, pubkey_auth_attempt, authoptp)); |