← Back to branch summary

~ubuntu-branches/ubuntu/vivid/389-ds-base/vivid-proposed

« back to all changes in this revision

Viewing changes to ldap/servers/slapd/back-ldbm/ldif2ldbm.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2014-07-08 15:50:11 UTC
  • mfrom: (0.2.2)
  • Revision ID: package-import@ubuntu.com-20140708155011-r66lvtioamqwaype
Tags: 1.3.2.19-1
* New upstream release.
* admin_scripts.diff: Updated to fix more bashisms.
* watch: Update the url.
* Install failedbinds.py and logregex.py scripts.
* init: Use status from init-functions.
* control: Update my email.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldap/servers/slapd/back-ldbm/ldif2ldbm.c
292
292
            if ( (idl = index_read( be, LDBM_ENTRYDN_STR, indextype_EQUALITY, 
293
293
                                    &bv, NULL, &err )) != NULL ) {
294
294
                pid = idl_firstid( idl );
295
 
                idl_free( idl );
 
295
                idl_free( &idl );
296
296
            } else {
297
297
                /* empty idl */
298
298
                if ( 0 != err && DB_NOTFOUND != err ) {
592
592
                    /* We get the count from the IDL */
593
593
                    sub_count = idl->b_nids;
594
594
                }
595
 
                idl_free(idl);
 
595
                idl_free(&idl);
596
596
            } 
597
597
            /* Did we get the count ? */
598
598
            if (found_count) {
891
891
                continue;
892
892
            }
893
893
            id = idl_firstid(idl);
894
 
            idl_free(idl);
895
 
            idl = NULL;
 
894
            idl_free(&idl);
896
895
        }
897
896
 
898
897
        /*
900
899
         */
901
900
        if (entryrdn_get_noancestorid()) {
902
901
            /* subtree-rename: on && no ancestorid */
903
 
            *err = entryrdn_get_subordinates(be, &sdn, id, &idl, txn);
 
902
            *err = entryrdn_get_subordinates(be, &sdn, id, &idl, txn, 0);
904
903
        } else {
905
904
            *err = ldbm_ancestorid_read(be, txn, id, &idl);
906
905
        }
930
929
            idltotal = idl;
931
930
        } else if (idl) {
932
931
            idltmp = idl_union(be, idltotal, idl);
933
 
            idl_free(idltotal);
934
 
            idl_free(idl);
 
932
            idl_free(&idltotal);
 
933
            idl_free(&idl);
935
934
            idltotal = idltmp;
936
935
        }
937
936
    } /* for (i = 0; include[i]; i++) */
1333
1332
            /* allids list is no help at all -- revert to trawling
1334
1333
             * the whole list. */
1335
1334
            ok_index = 0;
1336
 
            idl_free(idl);
1337
 
            idl = NULL;
 
1335
            idl_free(&idl);
1338
1336
        }
1339
1337
        idindex = 0;
1340
1338
    }
1590
1588
    }
1591
1589
bye:
1592
1590
    if (idl) {
1593
 
        idl_free(idl);
 
1591
        idl_free(&idl);
1594
1592
    }
1595
1593
    if (dbc) {
1596
1594
        dbc->c_close(dbc);
1621
1619
    }
1622
1620
 
1623
1621
    ldbm_back_free_incl_excl(include_suffix, exclude_suffix);
1624
 
    idl_free(eargs.pre_exported_idl);
 
1622
    idl_free(&(eargs.pre_exported_idl));
1625
1623
    
1626
1624
    return( return_value );
1627
1625
}
1935
1933
            }
1936
1934
        } else if (ALLIDS(idl)) {
1937
1935
            /* that's no help. */
1938
 
            idl_free(idl);
1939
 
            idl = NULL;
 
1936
            idl_free(&idl);
1940
1937
        }
1941
1938
    }
1942
1939
 
2445
2442
err_out:
2446
2443
    backentry_free( &ep ); /* if ep or *ep is NULL, it does nothing */
2447
2444
    if (idl) {
2448
 
        idl_free(idl);
 
2445
        idl_free(&idl);
2449
2446
    } else {
2450
2447
        dbc->c_close(dbc);
2451
2448
    }