Attachment 294210 Details for Bug 430963 – lokkit patch for empty configuration.

lokkit patch for empty configuration.

lokkit.patch (text/x-patch), 1.25 KB, created by Thomas Woerner on 2008-02-07 15:03:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Woerner

Created: 2008-02-07 15:03:03 UTC

Size: 1.25 KB

patch

obsolete

>Index: lokkit
>===================================================================
>RCS file: /usr/local/CVS/system-config-firewall/src/lokkit,v
>retrieving revision 1.18
>diff -u -r1.18 lokkit
>--- lokkit	31 Jan 2008 11:05:22 -0000	1.18
>+++ lokkit	7 Feb 2008 14:42:24 -0000
>@@ -84,10 +84,13 @@
>     # /etc/sysconfig/system-config-securitylevel
>     old_config = read_sysconfig_config(old_config)
> 
>-    # parse selinux config
>-    selinux_args = fw_selinux.read() or [ ]
>+# parse selinux config
>+selinux_args = fw_selinux.read()
>+if selinux_args:
>     old_config = parseSELinuxArgs(selinux_args, options=old_config)
> 
>+# reparse lokkit args on a copy of the old configuration
>+if old_config:
>     config = parseLokkitArgs(options=copyValues(old_config))
> 
> if config.update:
>@@ -232,8 +235,8 @@
>     if not config.selinuxtype:
>         config.selinuxtype = DEFAULT_SELINUX_TYPE
> 
>-    if config.selinux != old_config.selinux or \
>-           config.selinuxtype != old_config.selinuxtype:
>+    if not old_config or (config.selinux != old_config.selinux or \
>+                          config.selinuxtype != old_config.selinuxtype):
>         se_status = int(fw_selinux.write(config) == False)
>         if se_status != 0:
>             print _("Failed to write selinux configuration.")

Actions: View

Attachments on bug 430963: 294210 | 294229 | 294235