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 c1f2bc2af..dd5161ecd 100644
--- a/servconf.c
+++ b/servconf.c
@@ -132,6 +132,7 @@ initialize_server_options(ServerOptions *options)
132 options->adm_forced_command = NULL; 132 options->adm_forced_command = NULL;
133 options->chroot_directory = NULL; 133 options->chroot_directory = NULL;
134 options->zero_knowledge_password_authentication = -1; 134 options->zero_knowledge_password_authentication = -1;
135 options->debian_banner = -1;
135} 136}
136 137
137void 138void
@@ -273,6 +274,8 @@ fill_default_server_options(ServerOptions *options)
273 options->permit_tun = SSH_TUNMODE_NO; 274 options->permit_tun = SSH_TUNMODE_NO;
274 if (options->zero_knowledge_password_authentication == -1) 275 if (options->zero_knowledge_password_authentication == -1)
275 options->zero_knowledge_password_authentication = 0; 276 options->zero_knowledge_password_authentication = 0;
277 if (options->debian_banner == -1)
278 options->debian_banner = 1;
276 279
277 /* Turn privilege separation on by default */ 280 /* Turn privilege separation on by default */
278 if (use_privsep == -1) 281 if (use_privsep == -1)
@@ -320,6 +323,7 @@ typedef enum {
320 sMatch, sPermitOpen, sForceCommand, sChrootDirectory, 323 sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
321 sUsePrivilegeSeparation, sAllowAgentForwarding, 324 sUsePrivilegeSeparation, sAllowAgentForwarding,
322 sZeroKnowledgePasswordAuthentication, 325 sZeroKnowledgePasswordAuthentication,
326 sDebianBanner,
323 sDeprecated, sUnsupported 327 sDeprecated, sUnsupported
324} ServerOpCodes; 328} ServerOpCodes;
325 329
@@ -449,6 +453,7 @@ static struct {
449 { "permitopen", sPermitOpen, SSHCFG_ALL }, 453 { "permitopen", sPermitOpen, SSHCFG_ALL },
450 { "forcecommand", sForceCommand, SSHCFG_ALL }, 454 { "forcecommand", sForceCommand, SSHCFG_ALL },
451 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, 455 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
456 { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
452 { NULL, sBadOption, 0 } 457 { NULL, sBadOption, 0 }
453}; 458};
454 459
@@ -1335,6 +1340,10 @@ process_server_config_line(ServerOptions *options, char *line,
1335 *charptr = xstrdup(arg); 1340 *charptr = xstrdup(arg);
1336 break; 1341 break;
1337 1342
1343 case sDebianBanner:
1344 intptr = &options->debian_banner;
1345 goto parse_int;
1346
1338 case sDeprecated: 1347 case sDeprecated:
1339 logit("%s line %d: Deprecated option %s", 1348 logit("%s line %d: Deprecated option %s",
1340 filename, linenum, arg); 1349 filename, linenum, arg);