mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-11-27 02:22:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Additional updates for devel (NT builds, header changes, todo update)

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-06-13 21:21:13 +00:00
parent 3b15c6f10f
commit b32dc224ae
9 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clients/tools/ldapdelete.c
View File

@ -310,7 +310,7 @@ main( int argc, char **argv )
fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
}
if ( use_tls && ldap_start_tls( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls > 1 ) {
ldap_perror( ld, "ldap_start_tls" );
return( EXIT_FAILURE );

2
clients/tools/ldapmodify.c
View File

@ -374,7 +374,7 @@ main( int argc, char **argv )
fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION to %d\n", version );
}
if ( use_tls && ldap_start_tls( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls > 1 ) {
ldap_perror( ld, "ldap_start_tls" );
return( EXIT_FAILURE );

2
clients/tools/ldapmodrdn.c
View File

@ -357,7 +357,7 @@ main(int argc, char **argv)
fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
}
if ( use_tls && ldap_start_tls( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls > 1 ) {
ldap_perror( ld, "ldap_start_tls" );
return( EXIT_FAILURE );

2
clients/tools/ldappasswd.c
View File

@ -314,7 +314,7 @@ main( int argc, char *argv[] )
fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
}
if ( use_tls && ldap_start_tls( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls > 1 ) {
ldap_perror( ld, "ldap_start_tls" );
return( EXIT_FAILURE );

2
clients/tools/ldapsearch.c
View File

@ -517,7 +517,7 @@ main( int argc, char **argv )
fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
}
if ( use_tls && ldap_start_tls( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
if ( use_tls > 1 ) {
ldap_perror( ld, "ldap_start_tls" );
return( EXIT_FAILURE );

4
libraries/libldap/libldap.dsp
View File

@ -351,6 +351,10 @@ SOURCE=.\tls.c
# End Source File
# Begin Source File
SOURCE=.\tmplout.c
# End Source File
# Begin Source File
SOURCE=.\ufn.c
# End Source File
# Begin Source File

4
libraries/libldap/open.c
View File

@ -230,7 +230,7 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url )
}
int
ldap_start_tls ( LDAP *ld,
ldap_start_tls_s ( LDAP *ld,
LDAPControl **serverctrls,
LDAPControl **clientctrls )
{
@ -249,8 +249,10 @@ ldap_start_tls ( LDAP *ld,
for (lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next) {
if (ldap_pvt_tls_inplace(lc->lconn_sb) != 0)
return LDAP_OPERATIONS_ERROR;
rc = ldap_extended_operation_s(ld, LDAP_EXOP_START_TLS,
NULL, serverctrls, clientctrls, &rspoid, &rspdata);
if (rc != LDAP_SUCCESS)
return rc;
if (rspoid != NULL)

14
libraries/libldap_r/libldap_r.dsp
View File

@ -281,6 +281,7 @@ SOURCE=..\libldap\print.c
# Begin Source File
SOURCE=.\rdwr.c
# ADD CPP /I "..\libldap"
# End Source File
# Begin Source File
@ -332,10 +333,6 @@ SOURCE=.\thr_nt.c
# End Source File
# Begin Source File
SOURCE=.\thr_sleep.c
# End Source File
# Begin Source File
SOURCE=.\thr_stub.c
# End Source File
# Begin Source File
@ -348,6 +345,15 @@ SOURCE=..\libldap\tls.c
# End Source File
# Begin Source File
SOURCE=..\libldap\tmplout.c
# End Source File
# Begin Source File
SOURCE=.\tpool.c
# ADD CPP /I "..\libldap"
# End Source File
# Begin Source File
SOURCE=..\libldap\ufn.c
# End Source File
# Begin Source File

2
libraries/libldap_r/threads.c
View File

@ -52,7 +52,7 @@ int ldap_pvt_thread_destroy( void )
#ifndef LDAP_THREAD_HAVE_TPOOL
(void) ldap_int_thread_pool_shutdown();
#endif
(void) ldap_int_thread_destroy();
return ldap_int_thread_destroy();
}
#ifndef LDAP_THREAD_HAVE_GETCONCURRENCY