Fix URI

diff --git a/INSTALL b/INSTALL
index 374d9dc42801f75b8dc6a814abf8c8337e57c093..0029a2859ad9e657c88f495ae10a3b43cec884b6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -2,15 +2,13 @@ Making and Installing the OpenLDAP Distribution
 ===============================================
 
 This file provides brief instructions on how to build and install
-OpenLDAP on UNIX (and UNIX-like) system.  For other systems, please
-consult The OpenLDAP Administrator's Guide
-http://www.openldap.org/doc/admin/.
+OpenLDAP on UNIX (and UNIX-like) system.
 
 It is recommended that you read, or at least skim through, ALL of the
 instructions in this file before attempting to build the software.
 
 It is also recommended your review The OpenLDAP Administrator's Guide
-(http://www.openldap.org/devel/admin/) and the Frequently Asked
+(http://www.openldap.org/doc/admin/) and the Frequently Asked
 Questions (http://www.openldap.org/faq/) pages, in particular the
 Installation section (http://www.openldap.org/faq/index.cgi?file=8)
 and Platform Hints (http://www.openldap.org/faq/index.cgi?file=9)

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index dd2712bdcdb95f3a6ed155b2d16e2639b037fa79..9b349da6b09289d11aa0943742b4933ee13b62f7 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -725,9 +725,13 @@ main( int argc, char **argv )
                return EXIT_FAILURE;
        }
 
-       if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
-               if ( use_tls > 1 ) {
+       if ( use_tls ) {
+               rc = ldap_start_tls_s( ld, NULL, NULL );
+
+               if ( rc != LDAP_SUCCESS && use_tls > 1 ) {
                        ldap_perror( ld, "ldap_start_tls" );
+                       fprintf( stderr, "Could not start TLS %d: %s\n",
+                               rc, ldap_err2string( rc ) );
                        return EXIT_FAILURE;
                }
                fprintf( stderr, "WARNING: could not start TLS\n" );