revert previous commit; disable RESTART from ldap.conf

diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5
index 1b89325a8079883e91d3f377dabbffad8e0813c9..33bd1b9b54b35018611fe2ed78b21b92c53e3c0c 100644 (file)
--- a/doc/man/man5/ldap.conf.5
+++ b/doc/man/man5/ldap.conf.5
@@ -169,9 +169,10 @@ The default is on.
 Note that the command line tools
 .BR ldapsearch (1)
 &co always override this option.
-.TP
-.B RESTART <on/true/yes/off/false/no>
-Determines whether the library should implicitly restart connections (FIXME).
+.\" This should only be allowed via ldap_set_option(3)
+.\".TP
+.\".B RESTART <on/true/yes/off/false/no>
+.\"Determines whether the library should implicitly restart connections (FIXME).
 .TP
 .B SIZELIMIT <integer>
 Specifies a size limit to use when performing searches.  The

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 3e0b2b2b061fe4e99593b24a211f9f9fd846f145..a3892d3645d75ad3aa734626ed115225482b7751 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -85,7 +85,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},
+#if 0
+       /* This should only be allowed via ldap_set_option(3) */
        {0, ATTR_BOOL,          "RESTART",              NULL,   LDAP_BOOL_RESTART},
+#endif
 
 #ifdef HAVE_CYRUS_SASL
        {0, ATTR_STRING,        "SASL_MECH",            NULL,