diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-05-20 00:55:03 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-05-20 00:55:03 +0000 |
| commit | 1f05a48f559c74409ce6bb2f9c7b32de75bd0f31 (patch) | |
| tree | f21a5f6a2b56ca1c5b266b179c4c3aec68077b36 | |
| parent | c27690bd62aac8124d7f5d5adf25e4d5a55b1986 (diff) | |
the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile
and AuthorizedPrincipalsFile were not being correctly applied in
Match blocks, despite being overridable there; ok dtucker@
| -rw-r--r-- | usr.bin/ssh/servconf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 4ba31b432bd..29589876571 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.215 2011/05/11 04:47:06 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.216 2011/05/20 00:55:02 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1456,14 +1456,15 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) M_CP_INTOPT(ip_qos_bulk); M_CP_STROPT(banner); - if (preauth) - return; - M_CP_STROPT(adm_forced_command); - M_CP_STROPT(chroot_directory); M_CP_STROPT(trusted_user_ca_keys); M_CP_STROPT(revoked_keys_file); M_CP_STROPT(authorized_keys_file); M_CP_STROPT(authorized_principals_file); + + if (preauth) + return; + M_CP_STROPT(adm_forced_command); + M_CP_STROPT(chroot_directory); } #undef M_CP_INTOPT |