From 895ba2c346beb7e55d43be3d0c7f54fd287faa74 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Wed, 26 Jun 2013 10:31:18 +0200 Subject: sudo responder: use different callback for oob refresh https://fedorahosted.org/sssd/ticket/1693 Since we don't care about returned values from out of band refresh, we do not need to set callback data. However, this caused talloc to abort as it considers it as type mismatch when called from tevent_req_callback_data(). --- src/responder/sudo/sudosrv_get_sudorules.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c index e84631e3..4a121feb 100644 --- a/src/responder/sudo/sudosrv_get_sudorules.c +++ b/src/responder/sudo/sudosrv_get_sudorules.c @@ -450,11 +450,6 @@ sudosrv_dp_req_done(struct tevent_req *req) dbus_uint32_t err_min; char *err_msg; - if (cb_ctx == NULL) { - /* we are not interested in returned values */ - talloc_free(req); - return; - } cli_ctx = talloc_get_type(cb_ctx->cctx, struct cli_ctx); ret = sss_dp_get_sudoers_recv(cb_ctx->mem_ctx, req, @@ -470,6 +465,13 @@ sudosrv_dp_req_done(struct tevent_req *req) cb_ctx->callback(err_maj, err_min, err_msg, cb_ctx->ptr); } +static void +sudosrv_dp_oob_req_done(struct tevent_req *req) +{ + DEBUG(SSSDBG_TRACE_FUNC, ("Out of band refresh finished\n")); + talloc_free(req); +} + static void sudosrv_get_sudorules_dp_callback(uint16_t err_maj, uint32_t err_min, const char *err_msg, void *ptr) @@ -512,7 +514,7 @@ sudosrv_get_sudorules_dp_callback(uint16_t err_maj, uint32_t err_min, DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot issue DP request.\n")); } else { - tevent_req_set_callback(dpreq, sudosrv_dp_req_done, NULL); + tevent_req_set_callback(dpreq, sudosrv_dp_oob_req_done, NULL); } } -- cgit