Align with HEAD

diff --git a/acinclude.m4 b/acinclude.m4
index 855d9302cb434f8905c8b311c060a84c7f3b5200..c6b343607aaef5139d50380d3a3b0ad2dfa7c40d 100644 (file)
--- 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 d4e74126b93defce05997fcb784ec0d5d74131db..7aee669ce2efe1569a88a3349161289204d9a796 100644 (file)
--- 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 e76756567991af1d4f0c5e5c6761b17857331708..4e29e21abb72fad57df39e80d4dc5456bb380b19 100644 (file)
--- 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 7327d6a6543df756d74f103d51f5508879fd3e4b..a6bf34b5125e3dc6be728d26d553ae435179b2bc 100644 (file)
--- 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 b79e4d3f23a431caeaccfdcbccb5725c9cfe1277..8d254aabed18d96d9bbf80d7419de19d1a0a7464 100644 (file)
--- 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 114460b97ec7fb050c0f1d88ee01973679a97edd..b68961c653d81e1a4bda2940ff8bd874fe41efae 100644 (file)
--- 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 313f0bce0f433ca93db7004b50b5886314c3e232..86ff63b5a1ed4f95e56efce72d73afafd83bb28b 100644 (file)
--- 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] )