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 3fff3d531..5be47aecf 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -177,6 +177,7 @@ initialize_server_options(ServerOptions *options) | |||
177 | options->fingerprint_hash = -1; | 177 | options->fingerprint_hash = -1; |
178 | options->disable_forwarding = -1; | 178 | options->disable_forwarding = -1; |
179 | options->expose_userauth_info = -1; | 179 | options->expose_userauth_info = -1; |
180 | options->debian_banner = -1; | ||
180 | } | 181 | } |
181 | 182 | ||
182 | /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */ | 183 | /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */ |
@@ -393,6 +394,8 @@ fill_default_server_options(ServerOptions *options) | |||
393 | options->disable_forwarding = 0; | 394 | options->disable_forwarding = 0; |
394 | if (options->expose_userauth_info == -1) | 395 | if (options->expose_userauth_info == -1) |
395 | options->expose_userauth_info = 0; | 396 | options->expose_userauth_info = 0; |
397 | if (options->debian_banner == -1) | ||
398 | options->debian_banner = 1; | ||
396 | 399 | ||
397 | assemble_algorithms(options); | 400 | assemble_algorithms(options); |
398 | 401 | ||
@@ -480,6 +483,7 @@ typedef enum { | |||
480 | sStreamLocalBindMask, sStreamLocalBindUnlink, | 483 | sStreamLocalBindMask, sStreamLocalBindUnlink, |
481 | sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding, | 484 | sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding, |
482 | sExposeAuthInfo, sRDomain, | 485 | sExposeAuthInfo, sRDomain, |
486 | sDebianBanner, | ||
483 | sDeprecated, sIgnore, sUnsupported | 487 | sDeprecated, sIgnore, sUnsupported |
484 | } ServerOpCodes; | 488 | } ServerOpCodes; |
485 | 489 | ||
@@ -634,6 +638,7 @@ static struct { | |||
634 | { "disableforwarding", sDisableForwarding, SSHCFG_ALL }, | 638 | { "disableforwarding", sDisableForwarding, SSHCFG_ALL }, |
635 | { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL }, | 639 | { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL }, |
636 | { "rdomain", sRDomain, SSHCFG_ALL }, | 640 | { "rdomain", sRDomain, SSHCFG_ALL }, |
641 | { "debianbanner", sDebianBanner, SSHCFG_GLOBAL }, | ||
637 | { NULL, sBadOption, 0 } | 642 | { NULL, sBadOption, 0 } |
638 | }; | 643 | }; |
639 | 644 | ||
@@ -2056,6 +2061,10 @@ process_server_config_line(ServerOptions *options, char *line, | |||
2056 | *charptr = xstrdup(arg); | 2061 | *charptr = xstrdup(arg); |
2057 | break; | 2062 | break; |
2058 | 2063 | ||
2064 | case sDebianBanner: | ||
2065 | intptr = &options->debian_banner; | ||
2066 | goto parse_int; | ||
2067 | |||
2059 | case sDeprecated: | 2068 | case sDeprecated: |
2060 | case sIgnore: | 2069 | case sIgnore: |
2061 | case sUnsupported: | 2070 | case sUnsupported: |