Blame SOURCES/014-dbus.patch
|
 |
60de42 |
From c1bc760d534aa057808e7d6503bda60ab9afa120 Mon Sep 17 00:00:00 2001
|
|
|
60de42 |
From: Ken Gaillot <kgaillot@redhat.com>
|
|
|
60de42 |
Date: Mon, 9 Jan 2017 16:58:50 -0600
|
|
|
60de42 |
Subject: [PATCH] Fix: libservices: properly watch writable DBus handles
|
|
|
60de42 |
|
|
|
60de42 |
e2128e7 introduced a typo such that DBUS_WATCH_WRITABLE was never checked
|
|
|
60de42 |
---
|
|
|
60de42 |
lib/services/dbus.c | 5 +----
|
|
|
60de42 |
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
60de42 |
|
|
|
60de42 |
diff --git a/lib/services/dbus.c b/lib/services/dbus.c
|
|
|
60de42 |
index 0748c86..fb3e867 100644
|
|
|
60de42 |
--- a/lib/services/dbus.c
|
|
|
60de42 |
+++ b/lib/services/dbus.c
|
|
|
60de42 |
@@ -503,10 +503,7 @@ pcmk_dbus_watch_dispatch(gpointer userdata)
|
|
|
60de42 |
mainloop_io_t *client = dbus_watch_get_data(watch);
|
|
|
60de42 |
|
|
|
60de42 |
crm_trace("Dispatching client %p: %s", client, dbus_watch_flags_to_string(flags));
|
|
|
60de42 |
- if (enabled && is_set(flags, DBUS_WATCH_READABLE)) {
|
|
|
60de42 |
- oom = !dbus_watch_handle(watch, flags);
|
|
|
60de42 |
-
|
|
|
60de42 |
- } else if (enabled && is_set(flags, DBUS_WATCH_READABLE)) {
|
|
|
60de42 |
+ if (enabled && (flags & (DBUS_WATCH_READABLE|DBUS_WATCH_WRITABLE))) {
|
|
|
60de42 |
oom = !dbus_watch_handle(watch, flags);
|
|
|
60de42 |
|
|
|
60de42 |
} else if(enabled) {
|
|
|
60de42 |
--
|
|
|
60de42 |
1.8.3.1
|
|
|
60de42 |
|