Drop unnecessary memset()s

[openldap] / servers / slapd / back-meta / init.c

diff --git a/servers/slapd/back-meta/init.c b/servers/slapd/back-meta/init.c
index 46aee301ca401745680809bbc49f2b180138453b..7a7c604a90746b167af4a6d6aa081931329ad5da 100644 (file)
--- a/servers/slapd/back-meta/init.c
+++ b/servers/slapd/back-meta/init.c
@@ -90,6 +90,7 @@ meta_back_db_init(
        Backend         *be )
 {
        metainfo_t      *mi;
+       int             i;
 
        mi = ch_calloc( 1, sizeof( metainfo_t ) );
        if ( mi == NULL ) {
@@ -113,6 +114,12 @@ meta_back_db_init(
        /* safe default */
        mi->mi_nretries = META_RETRY_DEFAULT;
        mi->mi_version = LDAP_VERSION3;
+
+       for ( i = LDAP_BACK_PCONN_FIRST; i < LDAP_BACK_PCONN_LAST; i++ ) {
+               mi->mi_conn_priv[ i ].mic_num = 0;
+               LDAP_TAILQ_INIT( &mi->mi_conn_priv[ i ].mic_priv );
+       }
+       mi->mi_conn_priv_max = LDAP_BACK_CONN_PRIV_DEFAULT;
        
        be->be_private = mi;
 
@@ -125,7 +132,9 @@ meta_back_db_open(
 {
        metainfo_t      *mi = (metainfo_t *)be->be_private;
 
-       int             i, rc;
+       int             i,
+                       not_always = 0,
+                       rc;
 
        for ( i = 0; i < mi->mi_ntargets; i++ ) {
                slap_bindconf   sb = { 0 };
@@ -153,6 +162,18 @@ meta_back_db_open(
                                mt->mt_flags |= LDAP_BACK_F_CANCEL_EXOP;
                        }
                }
+
+               if ( not_always == 0 ) {
+                       if ( !( mt->mt_idassert_flags & LDAP_BACK_AUTH_OVERRIDE )
+                               || !( mt->mt_idassert_flags & LDAP_BACK_AUTH_AUTHZ_ALL ) )
+                       {
+                               not_always = 1;
+                       }
+               }
+       }
+
+       if ( not_always == 0 ) {
+               mi->mi_flags |= META_BACK_F_PROXYAUTHZ_ALWAYS;
        }
 
        return 0;
@@ -175,12 +196,11 @@ meta_back_conn_free(
        assert( mc->mc_refcnt == 0 );
 
        /* at least one must be present... */
-       assert( mc->mc_conns != NULL );
-       ntargets = mc->mc_conns[ 0 ].msc_info->mi_ntargets;
+       ntargets = mc->mc_info->mi_ntargets;
        assert( ntargets > 0 );
 
        for ( ; ntargets--; ) {
-               (void)meta_clear_one_candidate( &mc->mc_conns[ ntargets ] );
+               (void)meta_clear_one_candidate( NULL, mc, ntargets );
        }
 
        if ( !BER_BVISNULL( &mc->mc_local_ndn ) ) {
@@ -285,6 +305,14 @@ meta_back_db_destroy(
                if ( mi->mi_conninfo.lai_tree ) {
                        avl_free( mi->mi_conninfo.lai_tree, meta_back_conn_free );
                }
+               for ( i = LDAP_BACK_PCONN_FIRST; i < LDAP_BACK_PCONN_LAST; i++ ) {
+                       while ( !LDAP_TAILQ_EMPTY( &mi->mi_conn_priv[ i ].mic_priv ) ) {
+                               metaconn_t      *mc = LDAP_TAILQ_FIRST( &mi->mi_conn_priv[ i ].mic_priv );
+
+                               LDAP_TAILQ_REMOVE( &mi->mi_conn_priv[ i ].mic_priv, mc, mc_q );
+                               meta_back_conn_free( mc );
+                       }
+               }
 
                /*
                 * Destroy the per-target stuff (assuming there's at