Attachment 302512 Details for Bug 439810 – Fixed patch

[patch] Fixed patch

dbus-1.0.0-user-audit.patch (text/plain), 2.81 KB, created by Daniel Walsh on 2008-04-15 19:43:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Walsh

Created: 2008-04-15 19:43:03 UTC

Size: 2.81 KB

patch

obsolete

>diff -up dbus-1.0.0/bus/bus.c.dbus-1.0.0-user-audit dbus-1.0.0/bus/bus.c
>--- dbus-1.0.0/bus/bus.c.dbus-1.0.0-user-audit	2006-11-06 11:02:19.000000000 -0500
>+++ dbus-1.0.0/bus/bus.c	2008-04-11 12:40:44.000000000 -0400
>@@ -746,7 +746,7 @@ bus_context_new (const DBusString *confi
>       _dbus_string_free (&pid);
>     }
> 
>-  if (!bus_selinux_full_init ())
>+  if (!bus_selinux_full_init (context->user != NULL))
>     {
>       _dbus_warn ("SELinux initialization failed\n");
>     }
>diff -up dbus-1.0.0/bus/selinux.c.dbus-1.0.0-user-audit dbus-1.0.0/bus/selinux.c
>--- dbus-1.0.0/bus/selinux.c.dbus-1.0.0-user-audit	2008-04-11 12:40:43.000000000 -0400
>+++ dbus-1.0.0/bus/selinux.c	2008-04-11 12:40:44.000000000 -0400
>@@ -279,7 +279,7 @@ bus_selinux_pre_init (void)
>  * logging callbacks.
>  */
> dbus_bool_t
>-bus_selinux_full_init (void)
>+bus_selinux_full_init (int use_audit)
> {
> #ifdef HAVE_SELINUX
>   char *bus_context;
>@@ -336,7 +336,7 @@ bus_selinux_full_init (void)
>   freecon (bus_context);
>   
> #ifdef HAVE_LIBAUDIT
>-  audit_init ();
>+  if (use_audit) audit_init ();
> #endif /* HAVE_LIBAUDIT */
> 
>   return TRUE;
>diff -up dbus-1.0.0/bus/selinux.h.dbus-1.0.0-user-audit dbus-1.0.0/bus/selinux.h
>--- dbus-1.0.0/bus/selinux.h.dbus-1.0.0-user-audit	2005-07-16 13:34:08.000000000 -0400
>+++ dbus-1.0.0/bus/selinux.h	2008-04-11 12:40:44.000000000 -0400
>@@ -28,7 +28,7 @@
> #include "services.h"
> 
> dbus_bool_t bus_selinux_pre_init (void);
>-dbus_bool_t bus_selinux_full_init(void);
>+dbus_bool_t bus_selinux_full_init(int use_audit);
> void        bus_selinux_shutdown (void);
> 
> dbus_bool_t bus_selinux_enabled  (void);
>diff -up dbus-1.0.0/bus/test-main.c.dbus-1.0.0-user-audit dbus-1.0.0/bus/test-main.c
>--- dbus-1.0.0/bus/test-main.c.dbus-1.0.0-user-audit	2006-09-08 13:21:37.000000000 -0400
>+++ dbus-1.0.0/bus/test-main.c	2008-04-11 12:40:44.000000000 -0400
>@@ -58,7 +58,7 @@ test_pre_hook (void)
>   
>   if (_dbus_getenv ("DBUS_TEST_SELINUX")
>       && (!bus_selinux_pre_init ()
>-	  || !bus_selinux_full_init ()))
>+	  || !bus_selinux_full_init (1)))
>     die ("could not init selinux support");
> }
> 
>diff -up dbus-1.0.0/bus/bus.c~ dbus-1.0.0/bus/bus.c
>--- dbus-1.0.0/bus/bus.c~	2008-04-11 12:43:36.000000000 -0400
>+++ dbus-1.0.0/bus/bus.c	2008-04-15 13:06:12.000000000 -0400
>@@ -746,11 +746,6 @@ bus_context_new (const DBusString *confi
>       _dbus_string_free (&pid);
>     }
> 
>-  if (!bus_selinux_full_init (context->user != NULL))
>-    {
>-      _dbus_warn ("SELinux initialization failed\n");
>-    }
>-
>   if (!process_config_postinit (context, parser, error))
>     {
>       _DBUS_ASSERT_ERROR_IS_SET (error);
>@@ -775,6 +770,11 @@ bus_context_new (const DBusString *confi
> 	}
>     }
>   
>+  if (!bus_selinux_full_init (context->user != NULL))
>+    {
>+      _dbus_warn ("SELinux initialization failed\n");
>+    }
>+
>   dbus_server_free_data_slot (&server_data_slot);
>   
>   return context;

Actions: View | Diff

Attachments on bug 439810: 302331 | 302512