diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-09 21:42:13 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-09 21:42:13 +0100 |
| commit | 3b181564c552ed3bc464534714148556deeeca2c (patch) | |
| tree | 7e5a1d454dbec89cd85f9b5804566161a6790a24 /source3/passdb/pdb_smbpasswd.c | |
| parent | 0d2de5380d13d544c382e3626e3b84fbea4b70a7 (diff) | |
| parent | c666aef471174ca5d95afcc48924325e7caded14 (diff) | |
| download | samba-3b181564c552ed3bc464534714148556deeeca2c.tar.gz samba-3b181564c552ed3bc464534714148556deeeca2c.tar.bz2 samba-3b181564c552ed3bc464534714148556deeeca2c.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/passdb/pdb_smbpasswd.c')
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index b72e0f2cba..d663c7f0b2 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -1566,11 +1566,11 @@ static bool smbpasswd_search_next_entry(struct pdb_search *search, entry->acct_flags = state->entries[state->current].acct_flags; entry->account_name = talloc_strdup( - search->mem_ctx, state->entries[state->current].account_name); + search, state->entries[state->current].account_name); entry->fullname = talloc_strdup( - search->mem_ctx, state->entries[state->current].fullname); + search, state->entries[state->current].fullname); entry->description = talloc_strdup( - search->mem_ctx, state->entries[state->current].description); + search, state->entries[state->current].description); if ((entry->account_name == NULL) || (entry->fullname == NULL) || (entry->description == NULL)) { @@ -1593,8 +1593,7 @@ static bool smbpasswd_search_users(struct pdb_methods *methods, struct smb_passwd *pwd; FILE *fp; - search_state = TALLOC_ZERO_P(search->mem_ctx, - struct smbpasswd_search_state); + search_state = talloc_zero(search, struct smbpasswd_search_state); if (search_state == NULL) { DEBUG(0, ("talloc failed\n")); return false; |