diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-20 01:30:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-20 01:30:36 +0100 |
| commit | 5fe2b28f45289dc5578cdd536600f0d30a14d820 (patch) | |
| tree | 4bdf36d0d4d8bdddcb3d618b4b01839370ed57c3 /source3/utils/net.c | |
| parent | ec9aeeab00584f4d3dfe9afb83dc1a77b8463b81 (diff) | |
| parent | 3a4638db0351368d3b148bf547546f28fa0b1479 (diff) | |
| download | samba-5fe2b28f45289dc5578cdd536600f0d30a14d820.tar.gz samba-5fe2b28f45289dc5578cdd536600f0d30a14d820.tar.bz2 samba-5fe2b28f45289dc5578cdd536600f0d30a14d820.zip | |
Merge branch 'master' of git://git.samba.org/samba into minschema
Diffstat (limited to 'source3/utils/net.c')
| -rw-r--r-- | source3/utils/net.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c index d483198a9e..7823a98219 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -272,7 +272,7 @@ static bool search_maxrid(struct pdb_search *search, const char *type, num_entries = pdb_search_entries(search, 0, 0xffffffff, &entries); for (i=0; i<num_entries; i++) *max_rid = MAX(*max_rid, entries[i].rid); - pdb_search_destroy(search); + TALLOC_FREE(search); return true; } @@ -280,13 +280,14 @@ static uint32 get_maxrid(void) { uint32 max_rid = 0; - if (!search_maxrid(pdb_search_users(0), "users", &max_rid)) + if (!search_maxrid(pdb_search_users(talloc_tos(), 0), "users", &max_rid)) return 0; - if (!search_maxrid(pdb_search_groups(), "groups", &max_rid)) + if (!search_maxrid(pdb_search_groups(talloc_tos()), "groups", &max_rid)) return 0; - if (!search_maxrid(pdb_search_aliases(get_global_sam_sid()), + if (!search_maxrid(pdb_search_aliases(talloc_tos(), + get_global_sam_sid()), "aliases", &max_rid)) return 0; |