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

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 6e06b769e34ef3e005f0d27568e7c7940c8e0e04..4dc1d532cbf5af8320acaa7ee856ad1cbc8eb58b 100644 (file)
--- 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 d2b453cd1e6fa3892abf1be2be41f51d97af55bd..352c79a40f9f316e763b8b23c59bd2cffd1c698b 100644 (file)
--- 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 3aa05b10f073d3e363b3d821a61be97aa7829071..d26b741474b24f560a32f48bd4d0ff599ee06889 100644 (file)
--- 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 18b19c2d6143aebcb460273d14a8c544b56081d4..ba01854048123d8bf88443a59fd92b167989fa1a 100644 (file)
--- 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 0bae49a3e1530c3f27b31e876f286ab0582a2781..8b8aa3ee007e2eee58a5e30b32cb6284d719cac0 100644 (file)
--- 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 5a9f03affcf45bd2f6d8879464b9b10f2c59d19e..0ba5b193b54ea00f63727ea0442486bedc1f1dc8 100644 (file)
--- 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 938739d7ebabb6b839ad737e960697c3db364287..f0a5a593df419905dd890d0f6e3f814e22145b91 100644 (file)
--- 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 86e5329c8823078b548a4c6078e301ff4cbcf9d7..1cf359ae8bb0c2a7f8896272c59e7944cb64ea88 100644 (file)
--- 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 9f845fe953e47676c6905421d7438ac33e905fbe..3ac48498e7ac9c44f96473d357efc03e7b68cca4 100644 (file)
--- 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