[PATCH] modem: do not allow more than one client to lock down

[Rémi Denis-Courmont]

---
 src/modem.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/modem.c b/src/modem.c
index 553549e..a92107e 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -805,11 +805,14 @@ static DBusMessage *set_property_lockdown(struct 
ofono_modem *modem,
        if (modem->pending != NULL)
                return __ofono_error_busy(msg);
 
+       caller = dbus_message_get_sender(msg);
+
+       if (modem->lockdown && g_strcmp0(caller, modem->lock_owner))
+               return __ofono_error_access_denied(msg);
+
        if (modem->lockdown == lockdown)
                return dbus_message_new_method_return(msg);
 
-       caller = dbus_message_get_sender(msg);
-
        if (lockdown) {
                dbus_bool_t powered;
 
@@ -847,12 +850,8 @@ static DBusMessage *set_property_lockdown(struct 
ofono_modem *modem,
                                        OFONO_MODEM_INTERFACE,
                                        "Powered", DBUS_TYPE_BOOLEAN,
                                        &powered);
-       } else {
-               if (g_strcmp0(caller, modem->lock_owner))
-                       return __ofono_error_access_denied(msg);
-
+       } else
                lockdown_remove(modem);
-       }
 
 done:
        g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);
-- 
1.7.1

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono