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 b3a2841fb..bec53e00e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -166,6 +166,7 @@ initialize_server_options(ServerOptions *options)
166 options->ip_qos_bulk = -1; 166 options->ip_qos_bulk = -1;
167 options->version_addendum = NULL; 167 options->version_addendum = NULL;
168 options->fingerprint_hash = -1; 168 options->fingerprint_hash = -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. */
@@ -342,6 +343,8 @@ fill_default_server_options(ServerOptions *options)
342 options->fwd_opts.streamlocal_bind_unlink = 0; 343 options->fwd_opts.streamlocal_bind_unlink = 0;
343 if (options->fingerprint_hash == -1) 344 if (options->fingerprint_hash == -1)
344 options->fingerprint_hash = SSH_FP_HASH_DEFAULT; 345 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
346 if (options->debian_banner == -1)
347 options->debian_banner = 1;
345 /* Turn privilege separation on by default */ 348 /* Turn privilege separation on by default */
346 if (use_privsep == -1) 349 if (use_privsep == -1)
347 use_privsep = PRIVSEP_NOSANDBOX; 350 use_privsep = PRIVSEP_NOSANDBOX;
@@ -412,6 +415,7 @@ typedef enum {
412 sAuthenticationMethods, sHostKeyAgent, sPermitUserRC, 415 sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
413 sStreamLocalBindMask, sStreamLocalBindUnlink, 416 sStreamLocalBindMask, sStreamLocalBindUnlink,
414 sAllowStreamLocalForwarding, sFingerprintHash, 417 sAllowStreamLocalForwarding, sFingerprintHash,
418 sDebianBanner,
415 sDeprecated, sUnsupported 419 sDeprecated, sUnsupported
416} ServerOpCodes; 420} ServerOpCodes;
417 421
@@ -556,6 +560,7 @@ static struct {
556 { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL }, 560 { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
557 { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL }, 561 { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
558 { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL }, 562 { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
563 { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
559 { NULL, sBadOption, 0 } 564 { NULL, sBadOption, 0 }
560}; 565};
561 566
@@ -1777,6 +1782,10 @@ process_server_config_line(ServerOptions *options, char *line,
1777 options->fingerprint_hash = value; 1782 options->fingerprint_hash = value;
1778 break; 1783 break;
1779 1784
1785 case sDebianBanner:
1786 intptr = &options->debian_banner;
1787 goto parse_int;
1788
1780 case sDeprecated: 1789 case sDeprecated:
1781 logit("%s line %d: Deprecated option %s", 1790 logit("%s line %d: Deprecated option %s",
1782 filename, linenum, arg); 1791 filename, linenum, arg);