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 /auth.h | |
| parent | 2c334fd36f80cb91cc42e4b978b10aa35e0df236 (diff) | |
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 'auth.h')
| -rw-r--r-- | auth.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.102 2021/12/19 22:12:07 djm Exp $ */ +/* $OpenBSD: auth.h,v 1.103 2022/05/27 05:01:25 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -133,8 +133,8 @@ int auth_password(struct ssh *, const char *); int hostbased_key_allowed(struct ssh *, struct passwd *, const char *, char *, struct sshkey *); -int user_key_allowed(struct ssh *, struct passwd *, struct sshkey *, int, - struct sshauthopt **); +int user_key_allowed(struct passwd *, struct sshkey *, int, + const char *, const char *, struct sshauthopt **); int auth2_key_already_used(Authctxt *, const struct sshkey *); /* @@ -214,8 +214,8 @@ int sshd_hostkey_sign(struct ssh *, struct sshkey *, struct sshkey *, const struct sshauthopt *auth_options(struct ssh *); int auth_activate_options(struct ssh *, struct sshauthopt *); void auth_restrict_session(struct ssh *); -int auth_authorise_keyopts(struct ssh *, struct passwd *pw, - struct sshauthopt *, int, const char *); +int auth_authorise_keyopts(struct passwd *pw, struct sshauthopt *, int, + const char *, const char *, const char *); void auth_log_authopts(const char *, const struct sshauthopt *, int); /* debug messages during authentication */ |