mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-02-19 02:28:47 -05:00
Align with HEAD
This commit is contained in:
parent
bae74822e1
commit
fd4628fb03
7 changed files with 9 additions and 10 deletions
|
|
@ -1,4 +1,3 @@
|
|||
dnl $OpenLDAP$
|
||||
dnl
|
||||
dnl Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
|
||||
dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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 );
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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] )
|
||||
|
|
|
|||
Loading…
Reference in a new issue