diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/servconf.c b/servconf.c index 49d3bdc8c..1cee3d6c2 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -166,6 +166,7 @@ initialize_server_options(ServerOptions *options) | |||
166 | options->version_addendum = NULL; | 166 | options->version_addendum = NULL; |
167 | options->fingerprint_hash = -1; | 167 | options->fingerprint_hash = -1; |
168 | options->disable_forwarding = -1; | 168 | options->disable_forwarding = -1; |
169 | options->debian_banner = -1; | ||
169 | } | 170 | } |
170 | 171 | ||
171 | /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */ | 172 | /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */ |
@@ -339,6 +340,8 @@ fill_default_server_options(ServerOptions *options) | |||
339 | options->fingerprint_hash = SSH_FP_HASH_DEFAULT; | 340 | options->fingerprint_hash = SSH_FP_HASH_DEFAULT; |
340 | if (options->disable_forwarding == -1) | 341 | if (options->disable_forwarding == -1) |
341 | options->disable_forwarding = 0; | 342 | options->disable_forwarding = 0; |
343 | if (options->debian_banner == -1) | ||
344 | options->debian_banner = 1; | ||
342 | 345 | ||
343 | assemble_algorithms(options); | 346 | assemble_algorithms(options); |
344 | 347 | ||
@@ -425,6 +428,7 @@ typedef enum { | |||
425 | sAuthenticationMethods, sHostKeyAgent, sPermitUserRC, | 428 | sAuthenticationMethods, sHostKeyAgent, sPermitUserRC, |
426 | sStreamLocalBindMask, sStreamLocalBindUnlink, | 429 | sStreamLocalBindMask, sStreamLocalBindUnlink, |
427 | sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding, | 430 | sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding, |
431 | sDebianBanner, | ||
428 | sDeprecated, sIgnore, sUnsupported | 432 | sDeprecated, sIgnore, sUnsupported |
429 | } ServerOpCodes; | 433 | } ServerOpCodes; |
430 | 434 | ||
@@ -577,6 +581,7 @@ static struct { | |||
577 | { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL }, | 581 | { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL }, |
578 | { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL }, | 582 | { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL }, |
579 | { "disableforwarding", sDisableForwarding, SSHCFG_ALL }, | 583 | { "disableforwarding", sDisableForwarding, SSHCFG_ALL }, |
584 | { "debianbanner", sDebianBanner, SSHCFG_GLOBAL }, | ||
580 | { NULL, sBadOption, 0 } | 585 | { NULL, sBadOption, 0 } |
581 | }; | 586 | }; |
582 | 587 | ||
@@ -1860,6 +1865,10 @@ process_server_config_line(ServerOptions *options, char *line, | |||
1860 | options->fingerprint_hash = value; | 1865 | options->fingerprint_hash = value; |
1861 | break; | 1866 | break; |
1862 | 1867 | ||
1868 | case sDebianBanner: | ||
1869 | intptr = &options->debian_banner; | ||
1870 | goto parse_int; | ||
1871 | |||
1863 | case sDeprecated: | 1872 | case sDeprecated: |
1864 | case sIgnore: | 1873 | case sIgnore: |
1865 | case sUnsupported: | 1874 | case sUnsupported: |