diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-03-07 19:02:43 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-03-08 06:20:35 +1100 |
commit | 95767262caa6692eff1e1565be1f5cb297949a89 (patch) | |
tree | 1055360a328d0998dabb966f2e1002389f8c6c41 /monitor_wrap.c | |
parent | af0bb38ffd1f2c4f9f43b0029be2efe922815255 (diff) |
upstream commit
refactor canohost.c: move functions that cache results closer
to the places that use them (authn and session code). After this, no state is
cached in canohost.c
feedback and ok markus@
Upstream-ID: 5f2e4df88d4803fc8ec59ec53629105e23ce625e
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index c5db6df48..552004902 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.87 2016/01/14 16:17:40 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.88 2016/03/07 19:02:43 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -378,15 +378,15 @@ mm_user_key_allowed(struct passwd *pw, Key *key, int pubkey_auth_attempt) | |||
378 | } | 378 | } |
379 | 379 | ||
380 | int | 380 | int |
381 | mm_hostbased_key_allowed(struct passwd *pw, char *user, char *host, | 381 | mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host, |
382 | Key *key) | 382 | Key *key) |
383 | { | 383 | { |
384 | return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0)); | 384 | return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0)); |
385 | } | 385 | } |
386 | 386 | ||
387 | int | 387 | int |
388 | mm_auth_rhosts_rsa_key_allowed(struct passwd *pw, char *user, | 388 | mm_auth_rhosts_rsa_key_allowed(struct passwd *pw, const char *user, |
389 | char *host, Key *key) | 389 | const char *host, Key *key) |
390 | { | 390 | { |
391 | int ret; | 391 | int ret; |
392 | 392 | ||
@@ -397,8 +397,8 @@ mm_auth_rhosts_rsa_key_allowed(struct passwd *pw, char *user, | |||
397 | } | 397 | } |
398 | 398 | ||
399 | int | 399 | int |
400 | mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key, | 400 | mm_key_allowed(enum mm_keytype type, const char *user, const char *host, |
401 | int pubkey_auth_attempt) | 401 | Key *key, int pubkey_auth_attempt) |
402 | { | 402 | { |
403 | Buffer m; | 403 | Buffer m; |
404 | u_char *blob; | 404 | u_char *blob; |