This commit is contained in:
Kurt Zeilenga 2000-08-31 20:52:14 +00:00
parent 01bc25f159
commit 78f6d75586
2 changed files with 8 additions and 6 deletions

View file

@ -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)

View file

@ -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" );