diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-20 19:03:31 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-20 19:03:31 +1000 |
commit | 5d74e58e62df1e80c23ff8444ff22483cba1995a (patch) | |
tree | a24935b2d44262fc16cacbac072f28b067eea039 | |
parent | 8f639fe722133495eebad594f2f9c886857a5ef8 (diff) | |
download | openssh-git-5d74e58e62df1e80c23ff8444ff22483cba1995a.tar.gz |
- djm@cvs.openbsd.org 2011/05/20 00:55:02
[servconf.c]
the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile
and AuthorizedPrincipalsFile were not being correctly applied in
Match blocks, despite being overridable there; ok dtucker@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | servconf.c | 11 |
2 files changed, 11 insertions, 5 deletions
@@ -15,6 +15,11 @@ [key.c] fatal() if asked to generate a legacy ECDSA cert (these don't exist) and fix the regress test that was trying to generate them :) + - djm@cvs.openbsd.org 2011/05/20 00:55:02 + [servconf.c] + the options TrustedUserCAKeys, RevokedKeysFile, AuthorizedKeysFile + and AuthorizedPrincipalsFile were not being correctly applied in + Match blocks, despite being overridable there; ok dtucker@ 20110515 - (djm) OpenBSD CVS Sync @@ -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 @@ -1500,14 +1500,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 |