diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-05-27 05:01:25 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-05-27 16:36:06 +1000 |
| commit | 3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1 (patch) | |
| tree | f3163a4aa5e15f0cbde576bcb45206b6a75c8c4c /monitor_wrap.c | |
| parent | 2c334fd36f80cb91cc42e4b978b10aa35e0df236 (diff) | |
| download | openssh-git-3b0b142d2a0767d8cd838e2f3aefde8a0aaa41e1.tar.gz | |
upstream: refactor authorized_keys/principals handling
remove "struct ssh *" from arguments - this was only used to pass the
remote host/address. These can be passed in instead and the resulting
code is less tightly coupled to ssh_api.[ch]
ok dtucker@
OpenBSD-Commit-ID: 9d4373d013edc4cc4b5c21a599e1837ac31dda0d
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 748333c7..925985a8 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.123 2021/04/15 16:24:31 markus Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.124 2022/05/27 05:01:25 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -434,8 +434,9 @@ mm_auth_password(struct ssh *ssh, char *password) } int -mm_user_key_allowed(struct ssh *ssh, struct passwd *pw, struct sshkey *key, - int pubkey_auth_attempt, struct sshauthopt **authoptp) +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) { return (mm_key_allowed(MM_USERKEY, NULL, NULL, key, pubkey_auth_attempt, authoptp)); |