From 9b6814a59b359d237ec5b59d7983ddfd443c89d9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 3 Nov 2004 16:38:35 +0000
Subject: 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>.
---
 ChangeLog       | 5 +++++
 bus/test-main.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 331d54ce..603c7861 100644
--- 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 14e35f5f..1228ae94 100644
--- 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");
 }
 
-- 
cgit