diff options
author | Colin Watson <cjwatson@debian.org> | 2020-10-18 12:04:32 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-10-18 12:04:32 +0100 |
commit | 2b2c99658e3e8ed452e28f88f9cdbcdfb2a461cb (patch) | |
tree | 336445493163aa0370cb7830d97ebd8819b2e2c5 /auth.c | |
parent | 202f5a676221c244cd450086c334c2b59f339e86 (diff) | |
parent | 279261e1ea8150c7c64ab5fe7cb4a4ea17acbb29 (diff) |
Import openssh_8.4p1.orig.tar.gz
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.146 2020/01/31 22:42:45 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.147 2020/08/27 01:07:09 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -1006,21 +1006,22 @@ auth_log_authopts(const char *loc, const struct sshauthopt *opts, int do_remote) | |||
1006 | 1006 | ||
1007 | snprintf(buf, sizeof(buf), "%d", opts->force_tun_device); | 1007 | snprintf(buf, sizeof(buf), "%d", opts->force_tun_device); |
1008 | /* Try to keep this alphabetically sorted */ | 1008 | /* Try to keep this alphabetically sorted */ |
1009 | snprintf(msg, sizeof(msg), "key options:%s%s%s%s%s%s%s%s%s%s%s%s%s%s", | 1009 | snprintf(msg, sizeof(msg), "key options:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", |
1010 | opts->permit_agent_forwarding_flag ? " agent-forwarding" : "", | 1010 | opts->permit_agent_forwarding_flag ? " agent-forwarding" : "", |
1011 | opts->force_command == NULL ? "" : " command", | 1011 | opts->force_command == NULL ? "" : " command", |
1012 | do_env ? " environment" : "", | 1012 | do_env ? " environment" : "", |
1013 | opts->valid_before == 0 ? "" : "expires", | 1013 | opts->valid_before == 0 ? "" : "expires", |
1014 | opts->no_require_user_presence ? " no-touch-required" : "", | ||
1014 | do_permitopen ? " permitopen" : "", | 1015 | do_permitopen ? " permitopen" : "", |
1015 | do_permitlisten ? " permitlisten" : "", | 1016 | do_permitlisten ? " permitlisten" : "", |
1016 | opts->permit_port_forwarding_flag ? " port-forwarding" : "", | 1017 | opts->permit_port_forwarding_flag ? " port-forwarding" : "", |
1017 | opts->cert_principals == NULL ? "" : " principals", | 1018 | opts->cert_principals == NULL ? "" : " principals", |
1018 | opts->permit_pty_flag ? " pty" : "", | 1019 | opts->permit_pty_flag ? " pty" : "", |
1020 | opts->require_verify ? " uv" : "", | ||
1019 | opts->force_tun_device == -1 ? "" : " tun=", | 1021 | opts->force_tun_device == -1 ? "" : " tun=", |
1020 | opts->force_tun_device == -1 ? "" : buf, | 1022 | opts->force_tun_device == -1 ? "" : buf, |
1021 | opts->permit_user_rc ? " user-rc" : "", | 1023 | opts->permit_user_rc ? " user-rc" : "", |
1022 | opts->permit_x11_forwarding_flag ? " x11-forwarding" : "", | 1024 | opts->permit_x11_forwarding_flag ? " x11-forwarding" : ""); |
1023 | opts->no_require_user_presence ? " no-touch-required" : ""); | ||
1024 | 1025 | ||
1025 | debug("%s: %s", loc, msg); | 1026 | debug("%s: %s", loc, msg); |
1026 | if (do_remote) | 1027 | if (do_remote) |