Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 9c7f00db0c5c5a3ec3965d0bb782f6821afaa558..c74b9fc0896ec8895acb6c51d82281e2f866bb53 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1283,7 +1283,7 @@ static slap_verbmasks versionkey[] = {
        { BER_BVNULL, 0 }
 };
 
-int 
+int
 slap_keepalive_parse(
        struct berval *val,
        void *bc,
@@ -1989,20 +1989,6 @@ slap_client_connect( LDAP **ldp, slap_bindconf *sb )
        /* setting network keepalive options */
        slap_client_keepalive(ld, &sb->sb_keepalive);
 
-#if 0
-       if ( sb->sb_keepalive.sk_idle ) {
-               ldap_set_option( ld, LDAP_OPT_X_KEEPALIVE_IDLE, &sb->sb_keepalive.sk_idle );
-       }
-
-       if ( sb->sb_keepalive.sk_probes ) {
-               ldap_set_option( ld, LDAP_OPT_X_KEEPALIVE_PROBES, &sb->sb_keepalive.sk_probes );
-       }
-
-       if ( sb->sb_keepalive.sk_interval ) {
-               ldap_set_option( ld, LDAP_OPT_X_KEEPALIVE_INTERVAL, &sb->sb_keepalive.sk_interval );
-       }
-#endif /* 0 */
-
 #ifdef HAVE_TLS
        if ( sb->sb_tls_do_init ) {
                rc = bindconf_tls_set( sb, ld );