diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-11-08 18:22:17 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2006-11-08 18:22:17 +0000 |
| commit | ee8c7e7f6d6ad14e111ca15d5df1a385563cd1b6 (patch) | |
| tree | 68296d44e15bb612eb9093b9e9d100750d4f96af /hcid/dbus-manager.c | |
| parent | 135151c382018639cd3fce5f67bb53eb621b528e (diff) | |
Cleanup: checking service register/unregister return value
Diffstat (limited to 'hcid/dbus-manager.c')
| -rw-r--r-- | hcid/dbus-manager.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c index 30c8874a..53095769 100644 --- a/hcid/dbus-manager.c +++ b/hcid/dbus-manager.c @@ -277,8 +277,12 @@ static DBusHandlerResult register_service(DBusConnection *conn, reg_err = register_service_agent(conn, dbus_message_get_sender(msg), path, name, description); - if (reg_err < 0) + if (reg_err < 0) { + if (reg_err == -EADDRNOTAVAIL) + return error_service_already_exists(conn, msg); + return error_failed(conn, msg, -reg_err); + } /* Report that a new service was registered */ message = dbus_message_new_signal(BASE_PATH, MANAGER_INTERFACE, @@ -337,8 +341,13 @@ static DBusHandlerResult unregister_service(DBusConnection *conn, unreg_err = unregister_service_agent(conn, dbus_message_get_sender(msg), path); - if (unreg_err < 0) + if (unreg_err < 0) { + /* Only the owner can unregister it */ + if (unreg_err == -EPERM) + return error_not_authorized(conn, msg); + return error_failed(conn, msg, -unreg_err); + } /* Report that the service was unregistered */ message = dbus_message_new_signal(BASE_PATH, MANAGER_INTERFACE, |