From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 13 Nov 2006 23:51:52 +0000 (+0000)
Subject: revert previous commit; disable RESTART from ldap.conf
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~474
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=72e586ba361011067208dc8e8f5a619a3f0a8ea4;p=openldap

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 1b89325a80..33bd1b9b54 100644
--- 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 3e0b2b2b06..a3892d3645 100644
--- 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,