Fix check of host and port values in config file

43bef62a incorrectly dismissed the check for host/port config in the
case of a non-TLS setup. This commit fixes that.

Signed-off-by: Sayan Nandan <nandansayan@outlook.com>
next
Sayan Nandan 3 years ago
parent 9a6bf82408
commit f56610123e
No known key found for this signature in database
GPG Key ID: 5EDED89A1ADA6273

@ -241,7 +241,7 @@ impl ParsedConfig {
)); ));
} }
if let Some(sslopts) = cfg_info.ssl { if let Some(sslopts) = cfg_info.ssl {
let portcfg = if option_unwrap_or!(sslopts.only, false) { let portcfg = if sslopts.only.unwrap_or_default() {
PortConfig::SecureOnly { PortConfig::SecureOnly {
ssl: SslOpts { ssl: SslOpts {
key: sslopts.key, key: sslopts.key,
@ -264,6 +264,9 @@ impl ParsedConfig {
} }
}; };
cfg.ports = portcfg; cfg.ports = portcfg;
} else {
// make sure we check for portcfg for non-TLS connections
cfg.ports = PortConfig::new_insecure_only(cfg_info.server.host, cfg_info.server.port);
} }
set_if_exists!(cfg_info.server.maxclient, cfg.maxcon); set_if_exists!(cfg_info.server.maxclient, cfg.maxcon);
cfg cfg

Loading…
Cancel
Save