mirror of git://anongit.mindrot.org/openssh.git
upstream: no-touch-required certificate option should be an
extension, not a critical option. OpenBSD-Commit-ID: 626b22c5feb7be8a645e4b9a9bef89893b88600d
This commit is contained in:
parent
24b8bc578d
commit
e1dc1931cd
|
@ -1678,7 +1678,7 @@ prepare_options_buf(struct sshbuf *c, int which)
|
||||||
if ((which & OPTIONS_EXTENSIONS) != 0 &&
|
if ((which & OPTIONS_EXTENSIONS) != 0 &&
|
||||||
(certflags_flags & CERTOPT_USER_RC) != 0)
|
(certflags_flags & CERTOPT_USER_RC) != 0)
|
||||||
add_flag_option(c, "permit-user-rc");
|
add_flag_option(c, "permit-user-rc");
|
||||||
if ((which & OPTIONS_CRITICAL) != 0 &&
|
if ((which & OPTIONS_EXTENSIONS) != 0 &&
|
||||||
(certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0)
|
(certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0)
|
||||||
add_flag_option(c, "no-touch-required");
|
add_flag_option(c, "no-touch-required");
|
||||||
if ((which & OPTIONS_CRITICAL) != 0 &&
|
if ((which & OPTIONS_CRITICAL) != 0 &&
|
||||||
|
|
Loading…
Reference in New Issue