config: make meta expansion in set_val optional

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/common/config.cc b/src/common/config.cc
index b5037b7a8e165c1090d53e79ab078c88c1a2f9ca..7784338892217e19409f4ae4f90b58ab90793267 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -584,7 +584,7 @@ void md_config_t::set_val_or_die(const char *key, const char *val)
   assert(ret == 0);
 }
 
-int md_config_t::set_val(const char *key, const char *val)
+int md_config_t::set_val(const char *key, const char *val, bool meta)
 {
   Mutex::Locker l(lock);
   if (!key)
@@ -593,7 +593,8 @@ int md_config_t::set_val(const char *key, const char *val)
     return -EINVAL;
 
   std::string v(val);
-  expand_meta(v);
+  if (meta)
+    expand_meta(v);
 
   string k(ConfFile::normalize_key_name(key));
 

diff --git a/src/common/config.h b/src/common/config.h
index 53120224e61513535460792dd973c8507f1568bc..52144b8e3b442b88ecf3a091469962371ed79ab1 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -121,7 +121,7 @@ public:
 
   // Set a configuration value.
   // Metavariables will be expanded.
-  int set_val(const char *key, const char *val);
+  int set_val(const char *key, const char *val, bool meta=true);
 
   // Get a configuration value.
   // No metavariables will be returned (they will have already been expanded)