diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-07 11:44:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | ad0a07c531fadd1639c5298951cfaf5cfe0cb10e (patch) | |
| tree | a00938a8289ff4e9747622f1d46fa3607c7c50eb /source3/passdb | |
| parent | d5e6a47f064a3923b1e257ab84fa7ccd7c4f89f4 (diff) | |
| download | samba-ad0a07c531fadd1639c5298951cfaf5cfe0cb10e.tar.gz samba-ad0a07c531fadd1639c5298951cfaf5cfe0cb10e.tar.bz2 samba-ad0a07c531fadd1639c5298951cfaf5cfe0cb10e.zip | |
s3-talloc Change TALLOC_ZERO_P() to talloc_zero()
Using the standard macro makes it easier to move code into common, as
TALLOC_ZERO_P isn't standard talloc.
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/passdb.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 992f1b8741..fcdaf272c8 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -74,7 +74,7 @@ struct samu *samu_new( TALLOC_CTX *ctx ) { struct samu *user; - if ( !(user = TALLOC_ZERO_P( ctx, struct samu )) ) { + if ( !(user = talloc_zero( ctx, struct samu )) ) { DEBUG(0,("samuser_new: Talloc failed!\n")); return NULL; } diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 2d33d2d954..f8da0ff255 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -6480,7 +6480,7 @@ static NTSTATUS pdb_init_ldapsam_common(struct pdb_methods **pdb_method, const c /* TODO: Setup private data and free */ - if ( !(ldap_state = TALLOC_ZERO_P(*pdb_method, struct ldapsam_privates)) ) { + if ( !(ldap_state = talloc_zero(*pdb_method, struct ldapsam_privates)) ) { DEBUG(0, ("pdb_init_ldapsam_common: talloc() failed for ldapsam private_data!\n")); return NT_STATUS_NO_MEMORY; } diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 73dc0a5c6b..2cfacd3a13 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -1694,7 +1694,7 @@ static NTSTATUS pdb_init_smbpasswd( struct pdb_methods **pdb_method, const char /* Setup private data and free function */ - if ( !(privates = TALLOC_ZERO_P( *pdb_method, struct smbpasswd_privates )) ) { + if ( !(privates = talloc_zero( *pdb_method, struct smbpasswd_privates )) ) { DEBUG(0, ("talloc() failed for smbpasswd private_data!\n")); return NT_STATUS_NO_MEMORY; } |