summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Březina <pbrezina@redhat.com>2012-12-04 15:17:59 +0100
committerJakub Hrozek <jhrozek@redhat.com>2012-12-14 17:45:18 +0100
commita4273341a11a0f32b25564d2a23eafa1c3f78c26 (patch)
treea77f99f5c73c76f2e639e1b5c6e8ede63c026eb2
parentf9039fca7eaf4e14ab4b8bf0242203a921c82a9a (diff)
downloadsssd-a4273341a11a0f32b25564d2a23eafa1c3f78c26.tar.gz
sssd-a4273341a11a0f32b25564d2a23eafa1c3f78c26.tar.xz
sssd-a4273341a11a0f32b25564d2a23eafa1c3f78c26.zip
sudo: don't get stuck in rules and smart refresh when offline1.9.2-39
https://fedorahosted.org/sssd/ticket/1682 The problem was in following code: if (ret != EOK || state->dp_error != DP_ERR_OK || state->error != EOK) { tevent_req_error(req, ret); return; } In situation when data provider error occurs (e.g. when offline), ret == EOK but dp_error != DP_ERR_OK and we take the true branch. This results in calling tevent_req_error(req, EOK). Unfortunately, with EOK tevent_req_error only returns false, but does not trigger callback and this tevent request hangs forever, because no tevent_req_done(req) is called.
-rw-r--r--src/providers/ldap/sdap_sudo.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/providers/ldap/sdap_sudo.c b/src/providers/ldap/sdap_sudo.c
index 636eae41b..82c8e9374 100644
--- a/src/providers/ldap/sdap_sudo.c
+++ b/src/providers/ldap/sdap_sudo.c
@@ -782,8 +782,7 @@ static void sdap_sudo_rules_refresh_done(struct tevent_req *subreq)
&highest_usn, &downloaded_rules_num);
talloc_zfree(subreq);
if (ret != EOK || state->dp_error != DP_ERR_OK || state->error != EOK) {
- tevent_req_error(req, ret);
- return;
+ goto done;
}
/* set highest usn */
@@ -795,6 +794,12 @@ static void sdap_sudo_rules_refresh_done(struct tevent_req *subreq)
state->error = ENOENT;
}
+done:
+ if (ret != EOK) {
+ tevent_req_error(req, ret);
+ return;
+ }
+
tevent_req_done(req);
}
@@ -912,8 +917,7 @@ static void sdap_sudo_smart_refresh_done(struct tevent_req *subreq)
ret = sdap_sudo_refresh_recv(state, subreq, &dp_error, &error,
&highest_usn, NULL);
if (ret != EOK || dp_error != DP_ERR_OK || error != EOK) {
- tevent_req_error(req, ret);
- return;
+ goto done;
}
DEBUG(SSSDBG_TRACE_FUNC, ("Successful smart refresh of sudo rules\n"));
@@ -923,6 +927,12 @@ static void sdap_sudo_smart_refresh_done(struct tevent_req *subreq)
sdap_sudo_set_usn(state->id_ctx->srv_opts, highest_usn);
}
+done:
+ if (ret != EOK) {
+ tevent_req_error(req, ret);
+ return;
+ }
+
tevent_req_done(req);
}