From c30b7a1931211fdcae0564551a7625cc4f6dee9f Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 27 Apr 2016 11:11:31 +0200 Subject: UTIL: Add ERR_SBUS_REQUEST_HANDLED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In most cases when sbus request parsing finishes, the request is handled internally and a reply is sent to the caller. However, in handlers that are parsed and handled completely manually, we might want to be notified about this case so that the called of sbus_request_parse_or_finish() aborts the request and doesn't proceed with using the sbus request which is already freed internally in sbus_request_parse_or_finish(). Reviewed-by: Pavel Březina --- src/sbus/sssd_dbus_request.c | 1 + src/util/util_errors.c | 1 + src/util/util_errors.h | 1 + 3 files changed, 3 insertions(+) diff --git a/src/sbus/sssd_dbus_request.c b/src/sbus/sssd_dbus_request.c index aa57f6b65..c71a79b1f 100644 --- a/src/sbus/sssd_dbus_request.c +++ b/src/sbus/sssd_dbus_request.c @@ -74,6 +74,7 @@ sbus_request_invoke_or_finish(struct sbus_request *dbus_req, } switch(ret) { + case ERR_SBUS_REQUEST_HANDLED: case EOK: return; case ENOMEM: diff --git a/src/util/util_errors.c b/src/util/util_errors.c index 59ae63ab8..c998e14c2 100644 --- a/src/util/util_errors.c +++ b/src/util/util_errors.c @@ -84,6 +84,7 @@ struct err_string error_to_str[] = { { "Subdomain is inactive" }, /* ERR_SUBDOM_INACTIVE */ { "Account is locked" }, /* ERR_ACCOUNT_LOCKED */ { "AD renewal child failed" }, /* ERR_RENEWAL_CHILD */ + { "SBUS request already handled" }, /* ERR_SBUS_REQUEST_HANDLED */ { "ERR_LAST" } /* ERR_LAST */ }; diff --git a/src/util/util_errors.h b/src/util/util_errors.h index 05791f2f0..c0d9622a4 100644 --- a/src/util/util_errors.h +++ b/src/util/util_errors.h @@ -106,6 +106,7 @@ enum sssd_errors { ERR_SUBDOM_INACTIVE, ERR_ACCOUNT_LOCKED, ERR_RENEWAL_CHILD, + ERR_SBUS_REQUEST_HANDLED, ERR_LAST /* ALWAYS LAST */ }; -- cgit