technology: Soft block on offline mode or disabled technology
authorPatrik Flykt <patrik.flykt@linux.intel.com>
Wed, 12 Dec 2012 09:39:00 +0000 (11:39 +0200)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Wed, 12 Dec 2012 11:38:17 +0000 (13:38 +0200)
When adding an rfkill device which is unblocked, soft block it immediately
if offline mode is enabled or the technology (enable_persistent) is
disabled.

Fixes BMC#25858

src/technology.c

index 1ff8fb7..b0346a8 100644 (file)
@@ -1454,8 +1454,8 @@ done:
                                technology->enable_persistent == TRUE)
                return __connman_rfkill_block(type, FALSE);
        else if (technology->softblocked == FALSE &&
-                               global_offlinemode == TRUE &&
-                               technology->enable_persistent == FALSE)
+                       (global_offlinemode == TRUE ||
+                               technology->enable_persistent == FALSE))
                return __connman_rfkill_block(type, TRUE);
 
        return 0;