diff options
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/servconf.c b/servconf.c index 04a32973e..daed26a66 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: servconf.c,v 1.217 2011/05/20 02:00:19 dtucker Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.218 2011/05/20 03:25:45 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 |
| @@ -1499,11 +1499,8 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth) | |||
| 1499 | M_CP_INTOPT(ip_qos_interactive); | 1499 | M_CP_INTOPT(ip_qos_interactive); |
| 1500 | M_CP_INTOPT(ip_qos_bulk); | 1500 | M_CP_INTOPT(ip_qos_bulk); |
| 1501 | 1501 | ||
| 1502 | M_CP_STROPT(banner); | 1502 | /* See comment in servconf.h */ |
| 1503 | M_CP_STROPT(trusted_user_ca_keys); | 1503 | COPY_MATCH_STRING_OPTS(); |
| 1504 | M_CP_STROPT(revoked_keys_file); | ||
| 1505 | M_CP_STROPT(authorized_keys_file); | ||
| 1506 | M_CP_STROPT(authorized_principals_file); | ||
| 1507 | 1504 | ||
| 1508 | /* | 1505 | /* |
| 1509 | * The only things that should be below this point are string options | 1506 | * The only things that should be below this point are string options |