Fix ldap_rename parameter order (ITS#387)

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index b5011978d0589a43db62914274e9517b005cc38c..852926f785304f7c45660f9dcbb91e8ff55d20d7 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -133,6 +134,16 @@ ldap_ld_free(
                ld->ld_options.ldo_defhost = NULL;
        }
 
+       if ( ld->ld_options.ldo_tm_api != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_tm_api );
+               ld->ld_options.ldo_tm_api = NULL;
+       }
+
+       if ( ld->ld_options.ldo_tm_net != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_tm_net );
+               ld->ld_options.ldo_tm_net = NULL;
+       }
+
        ber_pvt_sb_destroy( &(ld->ld_sb) );   
    
        LDAP_FREE( (char *) ld );
@@ -161,12 +172,12 @@ ldap_send_unbind(
        Debug( LDAP_DEBUG_TRACE, "ldap_send_unbind\n", 0, 0, 0 );
 
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( ld->ld_errno );
        }
 
        /* fill it in */
-       if ( ber_printf( ber, "{itn", ++ld->ld_msgid,
+       if ( ber_printf( ber, "{itn" /*}*/, ++ld->ld_msgid,
            LDAP_REQ_UNBIND ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
@@ -179,8 +190,7 @@ ldap_send_unbind(
                return ld->ld_errno;
        }
 
-       if ( ber_printf( ber, "}", ++ld->ld_msgid,
-           LDAP_REQ_UNBIND ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "}", LDAP_REQ_UNBIND ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return( ld->ld_errno );