From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 28 Aug 2001 19:12:51 +0000 (+0000)
Subject: Align with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_0_12~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4628fb03f02588f7db73b8dde6a1e911bd033d;p=thirdparty%2Fopenldap.git

Align with HEAD
---

diff --git a/acinclude.m4 b/acinclude.m4
index 855d9302cb..c6b343607a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,3 @@
-dnl $OpenLDAP$
 dnl
 dnl Copyright 1998-2001 The OpenLDAP Foundation,  All Rights Reserved.
 dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index d4e74126b9..7aee669ce2 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -545,7 +545,7 @@ main( int argc, char **argv )
 		return EXIT_FAILURE;
 	}
 
-	if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+	if ( use_tls && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
 		ldap_perror( ld, "ldap_start_tls" );
 		if ( use_tls > 1 ) {
 			return EXIT_FAILURE;
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index e767565679..4e29e21abb 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -611,7 +611,7 @@ main( int argc, char **argv )
 		return EXIT_FAILURE;
 	}
 
-	if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+	if ( use_tls && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
 		ldap_perror( ld, "ldap_start_tls" );
 		if ( use_tls > 1 ) {
 			return( EXIT_FAILURE );
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 7327d6a654..a6bf34b512 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -582,7 +582,7 @@ main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+	if ( use_tls && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
 		ldap_perror( ld, "ldap_start_tls" );
 		if ( use_tls > 1 ) {
 			return( EXIT_FAILURE );
diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index b79e4d3f23..8d254aabed 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -596,7 +596,7 @@ main( int argc, char *argv[] )
 		return EXIT_FAILURE;
 	}
 
-	if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+	if ( use_tls && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
 		ldap_perror( ld, "ldap_start_tls" );
 		if ( use_tls > 1 ) {
 			return( EXIT_FAILURE );
diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 114460b97e..b68961c653 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -733,7 +733,7 @@ main( int argc, char **argv )
 		return EXIT_FAILURE;
 	}
 
-	if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+	if ( use_tls && ( ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS )) {
 		ldap_perror( ld, "ldap_start_tls" );
 		if ( use_tls > 1 ) {
 			return EXIT_FAILURE;
diff --git a/configure.in b/configure.in
index 313f0bce0f..86ff63b5a1 100644
--- a/configure.in
+++ b/configure.in
@@ -105,9 +105,9 @@ dnl General "enable" options
 OL_ARG_ENABLE(debug,[  --enable-debug 	  enable debugging], yes)dnl
 OL_ARG_ENABLE(syslog,[  --enable-syslog	  enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	  enable proctitle support], yes)dnl
-OL_ARG_ENABLE(cache,[  --enable-cache	  enable caching], yes)dnl
-OL_ARG_ENABLE(referrals,[  --enable-referrals	  enable V2 Referrals extension], yes)dnl
-OL_ARG_ENABLE(kbind,[  --enable-kbind	  enable V2 Kerberos IV bind], no)dnl
+OL_ARG_ENABLE(cache,[  --enable-cache	  enable caching (experimental)], no)dnl
+OL_ARG_ENABLE(referrals,[  --enable-referrals	  enable LDAPv2+ Referrals (experimental)], no)dnl
+OL_ARG_ENABLE(kbind,[  --enable-kbind	  enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
 OL_ARG_ENABLE(ipv6,[  --enable-ipv6 	  enable IPv6 support], auto)dnl
 OL_ARG_ENABLE(local,[  --enable-local	  enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	  enable cross compiling],
@@ -121,7 +121,7 @@ OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl	  with Cyrus SASL support],
 	auto, [auto yes no] )
 OL_ARG_WITH(fetch,[  --with-fetch		  with fetch URL support],
 	auto, [auto yes no] )
-OL_ARG_WITH(kerberos,[  --with-kerberos	  with support],
+OL_ARG_WITH(kerberos,[  --with-kerberos	  with Kerberos support],
 	auto, [auto k5 k5only k425 kth k4 afs yes no])
 OL_ARG_WITH(readline,[  --with-readline	  with readline support],
 	auto, [auto yes no] )