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 6caf1db38..c5dd617ef 100644
--- a/servconf.c
+++ b/servconf.c
@@ -182,6 +182,7 @@ initialize_server_options(ServerOptions *options)
182 options->fingerprint_hash = -1; 182 options->fingerprint_hash = -1;
183 options->disable_forwarding = -1; 183 options->disable_forwarding = -1;
184 options->expose_userauth_info = -1; 184 options->expose_userauth_info = -1;
185 options->debian_banner = -1;
185} 186}
186 187
187/* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */ 188/* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
@@ -417,6 +418,8 @@ fill_default_server_options(ServerOptions *options)
417 options->disable_forwarding = 0; 418 options->disable_forwarding = 0;
418 if (options->expose_userauth_info == -1) 419 if (options->expose_userauth_info == -1)
419 options->expose_userauth_info = 0; 420 options->expose_userauth_info = 0;
421 if (options->debian_banner == -1)
422 options->debian_banner = 1;
420 423
421 assemble_algorithms(options); 424 assemble_algorithms(options);
422 425
@@ -504,6 +507,7 @@ typedef enum {
504 sStreamLocalBindMask, sStreamLocalBindUnlink, 507 sStreamLocalBindMask, sStreamLocalBindUnlink,
505 sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding, 508 sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
506 sExposeAuthInfo, sRDomain, 509 sExposeAuthInfo, sRDomain,
510 sDebianBanner,
507 sDeprecated, sIgnore, sUnsupported 511 sDeprecated, sIgnore, sUnsupported
508} ServerOpCodes; 512} ServerOpCodes;
509 513
@@ -661,6 +665,7 @@ static struct {
661 { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL }, 665 { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
662 { "rdomain", sRDomain, SSHCFG_ALL }, 666 { "rdomain", sRDomain, SSHCFG_ALL },
663 { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL }, 667 { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
668 { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
664 { NULL, sBadOption, 0 } 669 { NULL, sBadOption, 0 }
665}; 670};
666 671
@@ -2173,6 +2178,10 @@ process_server_config_line(ServerOptions *options, char *line,
2173 *charptr = xstrdup(arg); 2178 *charptr = xstrdup(arg);
2174 break; 2179 break;
2175 2180
2181 case sDebianBanner:
2182 intptr = &options->debian_banner;
2183 goto parse_flag;
2184
2176 case sDeprecated: 2185 case sDeprecated:
2177 case sIgnore: 2186 case sIgnore:
2178 case sUnsupported: 2187 case sUnsupported: