dbus: return DBUS_ERROR_UNKNOWN_OBJECT when an object is unknown

diff --git a/src/dbus-job.c b/src/dbus-job.c
index 2a33039bdb23a95eb50b65ce5e0e022a96d3603c..e90d585b63d8e1d6657c61fc9a288d1a0c86a8a8 100644 (file)
--- a/src/dbus-job.c
+++ b/src/dbus-job.c
@@ -193,8 +193,11 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu
                 if (r == -ENOMEM)
                         return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
                 if (r == -ENOMEM)
                         return DBUS_HANDLER_RESULT_NEED_MEMORY;
 

-                if (r == -ENOENT)
-                        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+                if (r == -ENOENT) {
+                        DBusError e;
+                        dbus_set_error_const(&e, DBUS_ERROR_UNKNOWN_OBJECT, "Unknown job");
+                        return bus_send_error_reply(m, connection, message, &e, r);
+                }

 
                 return bus_send_error_reply(m, connection, message, NULL, r);
         }
 
                 return bus_send_error_reply(m, connection, message, NULL, r);
         }

diff --git a/src/dbus-unit.c b/src/dbus-unit.c
index 835eeda3292494b06bffaf623024eb235c074e13..cd6ad843f97b04d4f8fac6b995915a96532861f4 100644 (file)
--- a/src/dbus-unit.c
+++ b/src/dbus-unit.c
@@ -567,8 +567,11 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DB
                 if (r == -ENOMEM)
                         return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
                 if (r == -ENOMEM)
                         return DBUS_HANDLER_RESULT_NEED_MEMORY;
 

-                if (r == -ENOENT)
-                        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+                if (r == -ENOENT) {
+                        DBusError e;
+                        dbus_set_error_const(&e, DBUS_ERROR_UNKNOWN_OBJECT, "Unknown unit");
+                        return bus_send_error_reply(m, connection, message, &e, r);
+                }

 
                 return bus_send_error_reply(m, connection, message, NULL, r);
         }
 
                 return bus_send_error_reply(m, connection, message, NULL, r);
         }

diff --git a/src/dbus.h b/src/dbus.h
index 255b653376e9b924d2962bd31e498790232d461b..2aaeb4745ff776afd200a2e3f56cacca18cd2d14 100644 (file)
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -24,6 +24,14 @@
 
 #include <dbus/dbus.h>
 
 
 #include <dbus/dbus.h>
 

+#ifndef DBUS_ERROR_UNKNOWN_OBJECT
+#define DBUS_ERROR_UNKNOWN_OBJECT "org.freedesktop.DBus.Error.UnknownObject"
+#endif
+
+#ifndef DBUS_ERROR_UNKNOWN_INTERFACE
+#define DBUS_ERROR_UNKNOWN_INTERFACE "org.freedesktop.DBus.Error.UnknownInterface"
+#endif
+

 #include "manager.h"
 
 typedef int (*BusPropertyCallback)(Manager *m, DBusMessageIter *iter, const char *property, void *data);
 #include "manager.h"
 
 typedef int (*BusPropertyCallback)(Manager *m, DBusMessageIter *iter, const char *property, void *data);