>From 313623150e661105388af95c906488866236b97a Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 28 May 2014 14:11:54 +0200 Subject: [PATCH] Return dbus error if set --- src/responder/ifp/ifp_components.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/responder/ifp/ifp_components.c b/src/responder/ifp/ifp_components.c index 56fd566ed2baa5acf2435148ab5e724651c631dd..e5fa06cdd23fa9dcb3e3601a670a73857e4fc33d 100644 --- a/src/responder/ifp/ifp_components.c +++ b/src/responder/ifp/ifp_components.c @@ -519,6 +519,8 @@ done: if (ret == ENOMEM) { return sbus_request_fail_and_finish(dbus_req, NULL); + } else if (error != NULL) { + return sbus_request_fail_and_finish(dbus_req, error); } else if (ret != EOK) { error = sbus_error_new(dbus_req, DBUS_ERROR_FAILED, "%s", strerror(ret)); return sbus_request_fail_and_finish(dbus_req, error); @@ -588,6 +590,8 @@ done: if (ret == ENOMEM) { return sbus_request_fail_and_finish(dbus_req, NULL); + } else if (error != NULL) { + return sbus_request_fail_and_finish(dbus_req, error); } else if (ret != EOK) { error = sbus_error_new(dbus_req, DBUS_ERROR_FAILED, "%s", strerror(ret)); return sbus_request_fail_and_finish(dbus_req, error); -- 1.9.0