summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2014-05-02 16:29:45 +0200
committerJakub Hrozek <jhrozek@redhat.com>2014-06-03 13:31:17 +0200
commit0ca2e6881c6dfa99c42e34d0afd038c7a946b41c (patch)
treea40fc866c9f519f707b1b542fa5872827e1ffd31
parent7daf068c4bbf581a898891e130c244eb9707b32a (diff)
downloadsssd-0ca2e6881c6dfa99c42e34d0afd038c7a946b41c.tar.gz
sssd-0ca2e6881c6dfa99c42e34d0afd038c7a946b41c.tar.xz
sssd-0ca2e6881c6dfa99c42e34d0afd038c7a946b41c.zip
SBUS: Fix error handling condition
Reviewed-by: Pavel Březina <pbrezina@redhat.com> Reviewed-by: Stef Walter <stefw@redhat.com> (cherry picked from commit 94f07a6f4375ec25d8fa5c99a0c4f68de7002457)
-rw-r--r--src/sbus/sssd_dbus_request.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sbus/sssd_dbus_request.c b/src/sbus/sssd_dbus_request.c
index 342d8dfd2..d8b189095 100644
--- a/src/sbus/sssd_dbus_request.c
+++ b/src/sbus/sssd_dbus_request.c
@@ -226,7 +226,8 @@ sbus_request_parse_or_finish(struct sbus_request *request,
} else {
/* Trying to send the error back to the caller in this case is a joke */
- if (!dbus_error_is_set(&error) || dbus_error_has_name(&error, DBUS_ERROR_NO_MEMORY)) {
+ if (!dbus_error_is_set(&error) &&
+ dbus_error_has_name(&error, DBUS_ERROR_NO_MEMORY)) {
DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory parsing DBus message\n");
sbus_request_finish(request, NULL);