summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/man/sssd.conf.5.xml8
-rw-r--r--server/monitor/monitor.c5
2 files changed, 9 insertions, 4 deletions
diff --git a/server/man/sssd.conf.5.xml b/server/man/sssd.conf.5.xml
index 95fd606e7..cb378c845 100644
--- a/server/man/sssd.conf.5.xml
+++ b/server/man/sssd.conf.5.xml
@@ -362,12 +362,12 @@
<term>timeout (integer)</term>
<listitem>
<para>
- Timeout in seconds for this particular domain.
- Raising this timeout might prove useful for slower
- backends like distant LDAP servers.
+ Timeout in seconds between heartbeats for this domain.
+ This is used to ensure that the backend process is
+ alive and capable of answering requests.
</para>
<para>
- Default: 0 (no timeout)
+ Default: 10
</para>
</listitem>
</varlistentry>
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index d47b3a80a..30df2cb9c 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -1060,6 +1060,11 @@ static int get_service_config(struct mt_ctx *ctx, const char *name,
return ret;
}
+ /* 'timeout = 0' should be translated to the default */
+ if (svc->ping_time == 0) {
+ svc->ping_time = MONITOR_DEF_PING_TIME;
+ }
+
*svc_cfg = svc;
talloc_free(path);