Attachment 156737 Details for Bug 243743 – Honour the exit code of lokkit call.

Honour the exit code of lokkit call.

system-config-securitylevel-1.6.29.1-honour_exit_code.patch (text/x-patch), 2.61 KB, created by Thomas Woerner on 2007-06-11 16:56:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Woerner

Created: 2007-06-11 16:56:08 UTC

Size: 2.61 KB

patch

obsolete

>--- system-config-securitylevel-1.6.29.1/src/securitylevel.py.honour_exit_code	2006-10-20 17:43:06.000000000 +0200
>+++ system-config-securitylevel-1.6.29.1/src/securitylevel.py	2007-06-06 17:09:11.000000000 +0200
>@@ -411,7 +411,7 @@
> 
>         # With the new enabled/disabled behavior, we have to ignore the config
>         # file or else you can only ever turn on services.
>-        args = ['--quiet', '-f']
>+        args = ['/usr/sbin/lokkit', '--quiet', '-f']
> 
>         index = self.securityOptionMenu.get_active()
>         if index == 0:
>@@ -448,12 +448,49 @@
>         if self.doDebug:
>             print "don't call lokkit if in debug mode"
>         else:
>-            path = '/usr/sbin/lokkit'
>-
>-            lokkit = os.fork()
>-            if (not lokkit):
>-                args.insert(0, path)
>-                os.execv(path, args)                
>+            (rfd, wfd) = os.pipe()
>+            pid = os.fork()
>+            if pid == 0:
>+                try:
>+                    os.close(rfd)
>+                    fd = os.open("/dev/null", os.O_RDONLY)
>+                    if fd != 0:
>+                        os.dup2(fd, 0)
>+                        os.close(fd)
>+                    if wfd != 1:
>+                        os.dup2(wfd, 1)
>+                        os.close(wfd)
>+                    os.dup2(1, 2)
>+                    os.execv(args[0], args)
>+                finally:
>+                    os._exit(255)
>+
>+            os.close(wfd)
>+            # no need to read in chunks if we don't pass on data to some
>+            # output func
>+            cret = ""
>+            cout = os.read(rfd, 8192)
>+            while cout:
>+                cret += cout
>+                cout = os.read(rfd, 8192)
>+            os.close(rfd)
>+            (cpid, status) = os.waitpid(pid, 0)
>+
>+            # failed to configure firewall, show error message
>+            if status != 0:
>+                dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR,
>+                                        gtk.BUTTONS_CLOSE)
>+                dialog.set_markup("<b>" + _("Configuration failed") + \
>+                                  "</b>")
>+                dialog.format_secondary_text(" ".join(args) + "\n\n" + \
>+                                             cret.strip())
>+                dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
>+                dialog.set_transient_for(self.mainWindow)
>+                dialog.set_modal(True)
>+                dialog.show_all()
>+                dialog.run()
>+                dialog.destroy()
>+                return 1
> 
>         # Set these to False so if you click Apply followed by OK, you're not
>         # prompted twice.

Actions: View

Attachments on bug 243743: 156737