2004-11-03 Colin Walters <walters@verbum.org>

	* bus/test-main.c (test_pre_hook): Fix test logic,
	thanks Joerg Barfurth <Joerg.Barfurth@Sun.COM>.

diff --git a/ChangeLog b/ChangeLog
index 331d54c..603c786 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-03  Colin Walters  <walters@verbum.org>
+
+       * bus/test-main.c (test_pre_hook): Fix test logic,
+       thanks Joerg Barfurth <Joerg.Barfurth@Sun.COM>.
+
 2004-11-02  Colin Walters  <walters@redhat.com>
 
        * bus/selinux.c (bus_selinux_init): Split into two functions,

diff --git a/bus/test-main.c b/bus/test-main.c
index 14e35f5..1228ae9 100644 (file)
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -57,8 +57,8 @@ test_pre_hook (void)
 {
   
   if (_dbus_getenv ("DBUS_TEST_SELINUX")
-      && !bus_selinux_pre_init ()
-      && !bus_selinux_full_init ())
+      && (!bus_selinux_pre_init ()
+         || !bus_selinux_full_init ()))
     die ("could not init selinux support");
 }