- improved error handling

diff --git a/client/errors.cc b/client/errors.cc
index bda684e3a9ebe2a75628fe3cb10a52ef66ed79d6..12f7af93ae1ec1807e6a2cf5e715b10d1eefcf53 100644 (file)
--- a/client/errors.cc
+++ b/client/errors.cc
@@ -68,6 +68,9 @@ error_description(const DBus::ErrorException& e)
     if (name == "error.invalid_userdata")
        return _("Invalid userdata.");
 
+    if (name == "error.invalid_config")
+       return _("Invalid config.");
+
     if (name == "error.invalid_configdata")
        return _("Invalid configdata.");
 

diff --git a/server/Client.cc b/server/Client.cc
index b7aa9eeba1a85b9cc6ccb33938aa13cd4d43e6b7..15cba3ee306baaab0befc5a1d7ef0f291a9ea1d1 100644 (file)
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -1992,6 +1992,12 @@ Client::dispatch(DBus::Connection& conn, DBus::Message& msg)
        DBus::MessageError reply(msg, "error.delete_snapshot_failed", DBUS_ERROR_FAILED);
        conn.send(reply);
     }
+    catch (const InvalidConfigException& e)
+    {
+       SN_CAUGHT(e);
+       DBus::MessageError reply(msg, "error.invalid_config", DBUS_ERROR_FAILED);
+       conn.send(reply);
+    }
     catch (const InvalidConfigdataException& e)
     {
        SN_CAUGHT(e);