rename ldap_pvt_init_utils() to ldap_int_utils_init() and provide

[openldap] / libraries / libldap / unbind.c

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 7f17a1bb7363c24306d15a0f2caf251fcd59f363..0d89a5920003072ef0d2a991582f732a0fc77633 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -20,27 +20,36 @@
 
 #include "ldap-int.h"
 
+int
+ldap_unbind_ext(
+       LDAP *ld,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls )
+{
+       return ldap_ld_free( ld, 1, sctrls, cctrls );
+}
 
 int
 ldap_unbind( LDAP *ld )
 {
        Debug( LDAP_DEBUG_TRACE, "ldap_unbind\n", 0, 0, 0 );
 
-       return( ldap_ld_free( ld, 1 ));
+       return( ldap_unbind_ext( ld, NULL, NULL ) );
 }
 
 
 int
-ldap_ld_free( LDAP *ld, int close )
+ldap_ld_free(
+       LDAP *ld,
+       int close,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls )
 {
        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;
@@ -51,12 +60,6 @@ ldap_ld_free( LDAP *ld, int close )
                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 );
-                       ldap_close_connection( &ld->ld_sb );
-               }
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
        } else {
                int     i;
 
@@ -72,36 +75,58 @@ ldap_ld_free( LDAP *ld, int close )
        }
 
 #ifndef LDAP_NOCACHE
-       if ( ld->ld_cache != NULL )
+       if ( ld->ld_cache != NULL ) {
                ldap_destroy_cache( ld );
+               ld->ld_cache = NULL;
+       }
 #endif /* !LDAP_NOCACHE */
-       if ( ld->ld_error != NULL )
+
+       if ( ld->ld_error != NULL ) {
                free( ld->ld_error );
-       if ( ld->ld_matched != NULL )
+               ld->ld_error = NULL;
+       }
+
+       if ( ld->ld_matched != NULL ) {
                free( ld->ld_matched );
-       if ( ld->ld_host != NULL )
+               ld->ld_matched = NULL;
+       }
+
+       if ( ld->ld_host != NULL ) {
                free( ld->ld_host );
-       if ( ld->ld_ufnprefix != NULL )
+               ld->ld_host = NULL;
+       }
+
+       if ( ld->ld_ufnprefix != NULL ) {
                free( ld->ld_ufnprefix );
-       if ( ld->ld_filtd != NULL )
+               ld->ld_ufnprefix = NULL;
+       }
+
+       if ( ld->ld_filtd != NULL ) {
                ldap_getfilter_free( ld->ld_filtd );
-       if ( ld->ld_abandoned != NULL )
+               ld->ld_filtd = NULL;
+       }
+
+       if ( ld->ld_abandoned != NULL ) {
                free( ld->ld_abandoned );
+               ld->ld_abandoned = NULL;
+       }
 
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-       if ( ld->ld_selectinfo != NULL )
+       if ( ld->ld_selectinfo != NULL ) {
                ldap_free_select_info( ld->ld_selectinfo );
-#else
-       ber_clear( &(ld->ld_ber), 1 );
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+               ld->ld_selectinfo = NULL;
+       }
 
-       if ( ld->ld_options.ldo_defbase != NULL )
+       if ( ld->ld_options.ldo_defbase != NULL ) {
                free( ld->ld_options.ldo_defbase );
+               ld->ld_options.ldo_defbase = NULL;
+       }
 
-       if ( ld->ld_options.ldo_defhost != NULL )
+       if ( ld->ld_options.ldo_defhost != NULL ) {
                free( ld->ld_options.ldo_defhost );
+               ld->ld_options.ldo_defhost = NULL;
+       }
 
-       lber_pvt_sb_destroy( &(ld->ld_sb) );   
+       ber_pvt_sb_destroy( &(ld->ld_sb) );   
    
        free( (char *) ld );
    
@@ -113,12 +138,16 @@ ldap_ld_free( LDAP *ld, int close )
 int
 ldap_unbind_s( LDAP *ld )
 {
-       return( ldap_ld_free( ld, 1 ));
+       return( ldap_unbind_ext( ld, NULL, NULL ) );
 }
 
 
 int
-ldap_send_unbind( LDAP *ld, Sockbuf *sb )
+ldap_send_unbind(
+       LDAP *ld,
+       Sockbuf *sb,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls )
 {
        BerElement      *ber;
 
@@ -130,7 +159,20 @@ ldap_send_unbind( LDAP *ld, Sockbuf *sb )
        }
 
        /* 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 );
+               return( ld->ld_errno );
+       }
+
+       /* Put Server Controls */
+       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
+               ber_free( ber, 1 );
+               return ld->ld_errno;
+       }
+
+       if ( ber_printf( ber, "}", ++ld->ld_msgid,
            LDAP_REQ_UNBIND ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );