Return LDAP_BAD_PARAM if res is not EXOP result.

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index c9f14ec34a9c8d5d85711c2f9a0711ebc120b89e..39b3263e4c6dd2b04505c630b7e300fe7924ca84 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -9,10 +9,17 @@
  *  unbind.c
  */
 
+/* An Unbind Request looks like this:
+ *
+ *     UnbindRequest ::= NULL
+ *
+ * and has no response.
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -47,12 +54,9 @@ ldap_ld_free(
 {
        LDAPMessage     *lm, *next;
        int             err = LDAP_SUCCESS;
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        LDAPRequest     *lr, *nextlr;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
        if ( ld->ld_cldapnaddr == 0 ) {
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
                /* free LDAP structure and outstanding requests/responses */
                for ( lr = ld->ld_requests; lr != NULL; lr = nextlr ) {
                        nextlr = lr->lr_next;
@@ -63,19 +67,13 @@ ldap_ld_free(
                while ( ld->ld_conns != NULL ) {
                        ldap_free_connection( ld, ld->ld_conns, 1, close );
                }
-#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
-               if ( close ) {
-                       err = ldap_send_unbind( ld, &ld->ld_sb, sctrls, cctrls );
-                       ldap_close_connection( &ld->ld_sb );
-               }
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
        } else {
                int     i;
 
                for ( i = 0; i < ld->ld_cldapnaddr; ++i ) {
-                       free( ld->ld_cldapaddrs[ i ] );
+                       LDAP_FREE( ld->ld_cldapaddrs[ i ] );
                }
-               free( ld->ld_cldapaddrs );
+               LDAP_FREE( ld->ld_cldapaddrs );
        }
 
        for ( lm = ld->ld_responses; lm != NULL; lm = next ) {
@@ -91,22 +89,22 @@ ldap_ld_free(
 #endif /* !LDAP_NOCACHE */
 
        if ( ld->ld_error != NULL ) {
-               free( ld->ld_error );
+               LDAP_FREE( ld->ld_error );
                ld->ld_error = NULL;
        }
 
        if ( ld->ld_matched != NULL ) {
-               free( ld->ld_matched );
+               LDAP_FREE( ld->ld_matched );
                ld->ld_matched = NULL;
        }
 
        if ( ld->ld_host != NULL ) {
-               free( ld->ld_host );
+               LDAP_FREE( ld->ld_host );
                ld->ld_host = NULL;
        }
 
        if ( ld->ld_ufnprefix != NULL ) {
-               free( ld->ld_ufnprefix );
+               LDAP_FREE( ld->ld_ufnprefix );
                ld->ld_ufnprefix = NULL;
        }
 
@@ -116,32 +114,28 @@ ldap_ld_free(
        }
 
        if ( ld->ld_abandoned != NULL ) {
-               free( ld->ld_abandoned );
+               LDAP_FREE( ld->ld_abandoned );
                ld->ld_abandoned = NULL;
        }
 
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        if ( ld->ld_selectinfo != NULL ) {
                ldap_free_select_info( ld->ld_selectinfo );
                ld->ld_selectinfo = NULL;
        }
-#else
-       ber_clear( &(ld->ld_ber), 1 );
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 
        if ( ld->ld_options.ldo_defbase != NULL ) {
-               free( ld->ld_options.ldo_defbase );
+               LDAP_FREE( ld->ld_options.ldo_defbase );
                ld->ld_options.ldo_defbase = NULL;
        }
 
        if ( ld->ld_options.ldo_defhost != NULL ) {
-               free( ld->ld_options.ldo_defhost );
+               LDAP_FREE( ld->ld_options.ldo_defhost );
                ld->ld_options.ldo_defhost = NULL;
        }
 
        ber_pvt_sb_destroy( &(ld->ld_sb) );   
    
-       free( (char *) ld );
+       LDAP_FREE( (char *) ld );
    
        WSACleanup();
 
@@ -167,12 +161,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 );
@@ -185,8 +179,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 );