Merge pull request #15 from ancorgs/pre907907_cleanup

Code cleanup and some fixes

package/yast2-security.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 22 17:18:56 UTC 2014 - ancor@suse.com
+
+- Fixed the interface to show and process correctly values from
+  sysctl.conf.
+- Source code cleanup, including some minor fixes and new tests.
+
 -------------------------------------------------------------------
 Thu Dec  4 09:51:32 UTC 2014 - jreidinger@suse.com
 

src/include/security/dialogs.rb

@@ -118,7 +118,12 @@ def initialize_security_dialogs(include_target)
 
       # mapping for "Enable" and "Disable" links
       # current value -> new value
-      @link_value_mapping = { "yes" => "no", "no" => "yes" }
+      @link_value_mapping = {
+        "yes" => "no",
+        "no" => "yes",
+        "1" => "0",
+        "0" => "1"
+      }
 
       # mapping for "Configure" links
       # config name -> dialog name
@@ -154,9 +159,9 @@ def SecurityStatus(option, plaintext)
       # handle the special cases at first
       if Builtins.contains(@configurable_options, option)
         ret = _("Configure")
-      elsif value == "yes"
+      elsif ["1", "yes"].include?(value)
         ret = _("Enabled")
-      elsif value == "no"
+      elsif ["0", "no"].include?(value)
         ret = _("Disabled")
       else
         return @UNKNOWN_STATUS