diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-08 16:16:11 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-08 16:16:11 +1100 |
| commit | 6ac77d19b5a25a53459a58e4828fa9eac0bf11f4 (patch) | |
| tree | bb504eecdcb94d6c82b522f5de0fd13de130fb41 /source3/passdb/pdb_tdb.c | |
| parent | bb6a2c8076e5e9eabad4ee7f09f6df979616fd13 (diff) | |
| parent | 46bcb10b5abb21758cf234764b64220ede1b7ab5 (diff) | |
| download | samba-6ac77d19b5a25a53459a58e4828fa9eac0bf11f4.tar.gz samba-6ac77d19b5a25a53459a58e4828fa9eac0bf11f4.tar.bz2 samba-6ac77d19b5a25a53459a58e4828fa9eac0bf11f4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source3/passdb/pdb_tdb.c')
| -rw-r--r-- | source3/passdb/pdb_tdb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index 143a2e2390..3442561030 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -882,12 +882,9 @@ static bool tdbsam_search_next_entry(struct pdb_search *search, entry->acct_flags = pdb_get_acct_ctrl(user); entry->rid = rid; - entry->account_name = talloc_strdup( - search->mem_ctx, pdb_get_username(user)); - entry->fullname = talloc_strdup( - search->mem_ctx, pdb_get_fullname(user)); - entry->description = talloc_strdup( - search->mem_ctx, pdb_get_acct_desc(user)); + entry->account_name = talloc_strdup(search, pdb_get_username(user)); + entry->fullname = talloc_strdup(search, pdb_get_fullname(user)); + entry->description = talloc_strdup(search, pdb_get_acct_desc(user)); TALLOC_FREE(user); @@ -912,7 +909,7 @@ static bool tdbsam_search_users(struct pdb_methods *methods, return false; } - state = TALLOC_ZERO_P(search->mem_ctx, struct tdbsam_search_state); + state = talloc_zero(search, struct tdbsam_search_state); if (state == NULL) { DEBUG(0, ("talloc failed\n")); return false; |