URL: https://github.com/freeipa/freeipa/pull/5728 Author: abbra Title: #5728: ipa-otpd: handle LDAP timeout in a better way Action: opened
PR body: """ When LDAP server disconnects ipa-otpd client connection due to a timeout, ipa-otpd instance would stop and report an issue. This confuses systemd service reporting, so for these situations we better to shut down gracefully. Fixes: https://pagure.io/freeipa/issue/6587 Signed-off-by: Alexander Bokovoy <aboko...@redhat.com> """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/5728/head:pr5728 git checkout pr5728
From 7c9ab0a34450a0b6947ee70a3e38f09c7a4fd700 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy <aboko...@redhat.com> Date: Thu, 22 Apr 2021 18:11:15 +0300 Subject: [PATCH] ipa-otpd: handle LDAP timeout in a better way When LDAP server disconnects ipa-otpd client connection due to a timeout, ipa-otpd instance would stop and report an issue. This confuses systemd service reporting, so for these situations we better to shut down gracefully. Fixes: https://pagure.io/freeipa/issue/6587 Signed-off-by: Alexander Bokovoy <aboko...@redhat.com> --- daemons/ipa-otpd/bind.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daemons/ipa-otpd/bind.c b/daemons/ipa-otpd/bind.c index a98312f906a..3a289c4cb01 100644 --- a/daemons/ipa-otpd/bind.c +++ b/daemons/ipa-otpd/bind.c @@ -87,7 +87,9 @@ static void on_bind_readable(verto_ctx *vctx, verto_ev *ev) ldap_msgfree(results); otpd_log_err(EIO, "IO error received on bind socket"); verto_break(ctx.vctx); - ctx.exitstatus = 1; + /* if result is -1 or 0, connection was closed by the server side + * or the server is down and we should exit gracefully */ + ctx.exitstatus = (rslt <= 0) ? 0 : 1; return; }
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure