summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/servconf.c b/servconf.c
index e49984a81..bb43a649c 100644
--- a/servconf.c
+++ b/servconf.c
@@ -181,6 +181,7 @@ initialize_server_options(ServerOptions *options)
181 options->fingerprint_hash = -1; 181 options->fingerprint_hash = -1;
182 options->disable_forwarding = -1; 182 options->disable_forwarding = -1;
183 options->expose_userauth_info = -1; 183 options->expose_userauth_info = -1;
184 options->debian_banner = -1;
184} 185}
185 186
186/* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */ 187/* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
@@ -413,6 +414,8 @@ fill_default_server_options(ServerOptions *options)
413 options->disable_forwarding = 0; 414 options->disable_forwarding = 0;
414 if (options->expose_userauth_info == -1) 415 if (options->expose_userauth_info == -1)
415 options->expose_userauth_info = 0; 416 options->expose_userauth_info = 0;
417 if (options->debian_banner == -1)
418 options->debian_banner = 1;
416 419
417 assemble_algorithms(options); 420 assemble_algorithms(options);
418 421
@@ -500,6 +503,7 @@ typedef enum {
500 sStreamLocalBindMask, sStreamLocalBindUnlink, 503 sStreamLocalBindMask, sStreamLocalBindUnlink,
501 sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding, 504 sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
502 sExposeAuthInfo, sRDomain, 505 sExposeAuthInfo, sRDomain,
506 sDebianBanner,
503 sDeprecated, sIgnore, sUnsupported 507 sDeprecated, sIgnore, sUnsupported
504} ServerOpCodes; 508} ServerOpCodes;
505 509
@@ -656,6 +660,7 @@ static struct {
656 { "disableforwarding", sDisableForwarding, SSHCFG_ALL }, 660 { "disableforwarding", sDisableForwarding, SSHCFG_ALL },
657 { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL }, 661 { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
658 { "rdomain", sRDomain, SSHCFG_ALL }, 662 { "rdomain", sRDomain, SSHCFG_ALL },
663 { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
659 { NULL, sBadOption, 0 } 664 { NULL, sBadOption, 0 }
660}; 665};
661 666
@@ -2164,6 +2169,10 @@ process_server_config_line(ServerOptions *options, char *line,
2164 *charptr = xstrdup(arg); 2169 *charptr = xstrdup(arg);
2165 break; 2170 break;
2166 2171
2172 case sDebianBanner:
2173 intptr = &options->debian_banner;
2174 goto parse_flag;
2175
2167 case sDeprecated: 2176 case sDeprecated:
2168 case sIgnore: 2177 case sIgnore:
2169 case sUnsupported: 2178 case sUnsupported: