External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote_daemon: Validate tcp_min_ssf value only if found in config

Browse Source 
If there is no tcp_min_ssf value set in daemon config we still
compare it against the default (56 which corresponds to DES) and
if the value is below our expected minimum (112 which corresponds
to 3DES) an error is reported and the daemon refuses to start.
This is not what we want. What we want is to check the value iff
the value was specified in the config file.

Fixes: 58a48cff840
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2021-11-05 14:25:09 +01:00
parent 3edc7604bb
commit adc9c08b03
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/remote/remote_daemon_config.c
View File

@ -231,6 +231,8 @@ daemonConfigLoadOptions(struct daemonConfig *data,
const char *filename, const char *filename,
virConf *conf) virConf *conf)
{ {
int rc G_GNUC_UNUSED;
#ifdef WITH_IP #ifdef WITH_IP
if (virConfGetValueBool(conf, "listen_tcp", &data->listen_tcp) < 0) if (virConfGetValueBool(conf, "listen_tcp", &data->listen_tcp) < 0)
return -1; return -1;
@ -303,10 +305,9 @@ daemonConfigLoadOptions(struct daemonConfig *data,
if (virConfGetValueString(conf, "tls_priority", &data->tls_priority) < 0) if (virConfGetValueString(conf, "tls_priority", &data->tls_priority) < 0)
return -1; return -1;
if (virConfGetValueUInt(conf, "tcp_min_ssf", &data->tcp_min_ssf) < 0) if ((rc = virConfGetValueUInt(conf, "tcp_min_ssf", &data->tcp_min_ssf)) < 0) {
return -1; return -1;
} else if (rc > 0 && data->tcp_min_ssf < SSF_WARNING_LEVEL) {
if (data->tcp_min_ssf < SSF_WARNING_LEVEL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("minimum SSF levels lower than %d are not supported"), _("minimum SSF levels lower than %d are not supported"),
SSF_WARNING_LEVEL); SSF_WARNING_LEVEL);