2 files changed, 10 insertions, 2 deletions
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index ac12f8be633a..f70bb7823dc0 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -41,7 +41,7 @@ protected:
 
     virtual bool processFlag(Strings::iterator & pos, Strings::iterator end);
 
-    void printFlags(std::ostream & out);
+    virtual void printFlags(std::ostream & out);
 
     /* Positional arguments. */
     struct ExpectedArg
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index 2ca643fe0e71..994eab911707 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -31,6 +31,8 @@ class Config
 {
     friend class AbstractSetting;
 
+public:
+
     struct SettingData
     {
         bool isAlias;
@@ -40,7 +42,11 @@ class Config
         { }
     };
 
-    std::map<std::string, SettingData> _settings;
+    typedef std::map<std::string, SettingData> Settings;
+
+private:
+
+    Settings _settings;
 
     StringMap initials;
 
@@ -58,6 +64,8 @@ public:
 
     StringMap getSettings(bool overridenOnly = false);
 
+    const Settings & _getSettings() { return _settings; }
+
     void applyConfigFile(const Path & path, bool fatal = false);
 
     void resetOverriden();