ITS#9490 - Add keepalive settings to ldap.conf

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 4c4321e3e8ba2498dad3b7c913f7a6abc5756cf0..e731414c1b0d6e2e6bba9bdf3d824a36da3c18f9 100644 (file)
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -171,6 +171,18 @@ list of hosts may be provided.
 is deprecated in favor of
 .BR URI .
 .TP
+.B _KEEPALIVE_IDLE
+Sets/gets the number of seconds a connection needs to remain idle
+before TCP starts sending keepalive probes. Linux only.
+.TP
+.B KEEPALIVE_PROBES
+Sets/gets the maximum number of keepalive probes TCP should send
+before dropping the connection. Linux only.
+.TP
+.B KEEPALIVE_INTERVAL
+Sets/gets the interval in seconds between individual keepalive probes.
+Linux only.
+.TP
 .B NETWORK_TIMEOUT <integer>
 Specifies the timeout (in seconds) after which the poll(2)/select(2)
 following a connect(2) returns in case of no activity.

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 6a752361d3f87b299903289225d4a3892ec64656..f2e3e5038411079b0f9895b510214075a5aab43d 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -94,6 +94,10 @@ static const struct ol_attribute {
        {0, ATTR_OPTION,        "HOST",                 NULL,   LDAP_OPT_HOST_NAME}, /* deprecated */
        {0, ATTR_OPTION,        "URI",                  NULL,   LDAP_OPT_URI}, /* replaces HOST/PORT */
        {0, ATTR_BOOL,          "REFERRALS",    NULL,   LDAP_BOOL_REFERRALS},
+       {0, ATTR_INT,           "KEEPALIVE_IDLE",       NULL,   LDAP_OPT_X_KEEPALIVE_IDLE},
+       {0, ATTR_INT,           "KEEPALIVE_PROBES",     NULL,   LDAP_OPT_X_KEEPALIVE_PROBES},
+       {0, ATTR_INT,           "KEEPALIVE_INTERVAL",   NULL,   LDAP_OPT_X_KEEPALIVE_INTERVAL},
+
 #if 0
        /* This should only be allowed via ldap_set_option(3) */
        {0, ATTR_BOOL,          "RESTART",              NULL,   LDAP_BOOL_RESTART},