From 2ee07bb09b90015ff0d32e852113bb97930e8cf5 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sat, 6 Apr 2019 22:32:38 +0300 Subject: [PATCH] main: preserve config::client_encryption_options configuration source With dynamically updateable configuration, tracking the source of a value is more important, since we'll accept or reject updates depending on the source. Fix the source of client_encryption_options, which we RMW, by preserving the original source. --- main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cc b/main.cc index 0956b77135..3abb838705 100644 --- a/main.cc +++ b/main.cc @@ -521,7 +521,7 @@ int main(int ac, char** av) { } else { ceo["enabled"] = "false"; } - cfg->client_encryption_options(ceo); + cfg->client_encryption_options(std::move(ceo), cfg->client_encryption_options.source()); using namespace locator; // Re-apply strict-dma after we've read the config file, this time