From b32dc224ae4481c39720ba5a335a04d77fb0e1f9 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 13 Jun 2000 21:21:13 +0000 Subject: [PATCH] Additional updates for devel (NT builds, header changes, todo update) --- clients/tools/ldapdelete.c | 2 +- clients/tools/ldapmodify.c | 2 +- clients/tools/ldapmodrdn.c | 2 +- clients/tools/ldappasswd.c | 2 +- clients/tools/ldapsearch.c | 2 +- libraries/libldap/libldap.dsp | 4 ++++ libraries/libldap/open.c | 4 +++- libraries/libldap_r/libldap_r.dsp | 14 ++++++++++---- libraries/libldap_r/threads.c | 2 +- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index 6e06b769e3..4dc1d532cb 100644 --- a/clients/tools/ldapdelete.c +++ b/clients/tools/ldapdelete.c @@ -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 ); diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index d2b453cd1e..352c79a40f 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -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 ); diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index 3aa05b10f0..d26b741474 100644 --- a/clients/tools/ldapmodrdn.c +++ b/clients/tools/ldapmodrdn.c @@ -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 ); diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c index 18b19c2d61..ba01854048 100644 --- a/clients/tools/ldappasswd.c +++ b/clients/tools/ldappasswd.c @@ -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 ); diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c index 0bae49a3e1..8b8aa3ee00 100644 --- a/clients/tools/ldapsearch.c +++ b/clients/tools/ldapsearch.c @@ -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 ); diff --git a/libraries/libldap/libldap.dsp b/libraries/libldap/libldap.dsp index 5a9f03affc..0ba5b193b5 100644 --- a/libraries/libldap/libldap.dsp +++ b/libraries/libldap/libldap.dsp @@ -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 diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 938739d7eb..f0a5a593df 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -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) diff --git a/libraries/libldap_r/libldap_r.dsp b/libraries/libldap_r/libldap_r.dsp index 86e5329c88..1cf359ae8b 100644 --- a/libraries/libldap_r/libldap_r.dsp +++ b/libraries/libldap_r/libldap_r.dsp @@ -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 diff --git a/libraries/libldap_r/threads.c b/libraries/libldap_r/threads.c index 9f845fe953..3ac48498e7 100644 --- a/libraries/libldap_r/threads.c +++ b/libraries/libldap_r/threads.c @@ -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 -- 2.39.5