diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/servconf.c b/servconf.c index f862fbfd8..ab134ee55 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.215 2011/05/11 04:47:06 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.216 2011/05/20 00:55:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1500,14 +1500,15 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) | |||
1500 | M_CP_INTOPT(ip_qos_bulk); | 1500 | M_CP_INTOPT(ip_qos_bulk); |
1501 | 1501 | ||
1502 | M_CP_STROPT(banner); | 1502 | M_CP_STROPT(banner); |
1503 | if (preauth) | ||
1504 | return; | ||
1505 | M_CP_STROPT(adm_forced_command); | ||
1506 | M_CP_STROPT(chroot_directory); | ||
1507 | M_CP_STROPT(trusted_user_ca_keys); | 1503 | M_CP_STROPT(trusted_user_ca_keys); |
1508 | M_CP_STROPT(revoked_keys_file); | 1504 | M_CP_STROPT(revoked_keys_file); |
1509 | M_CP_STROPT(authorized_keys_file); | 1505 | M_CP_STROPT(authorized_keys_file); |
1510 | M_CP_STROPT(authorized_principals_file); | 1506 | M_CP_STROPT(authorized_principals_file); |
1507 | |||
1508 | if (preauth) | ||
1509 | return; | ||
1510 | M_CP_STROPT(adm_forced_command); | ||
1511 | M_CP_STROPT(chroot_directory); | ||
1511 | } | 1512 | } |
1512 | 1513 | ||
1513 | #undef M_CP_INTOPT | 1514 | #undef M_CP_INTOPT |