diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-19 12:20:11 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-14 12:53:56 +1000 |
| commit | 3b3e21bd9ba701a97e752205263a7903619541c7 (patch) | |
| tree | 3f0cdf8e4d5a550a323e73d229083d6329b3f236 /source3/passdb/pdb_ldap.c | |
| parent | 4786a493f70070dce6de4cbe488c9de1bdbb75ad (diff) | |
| download | samba-3b3e21bd9ba701a97e752205263a7903619541c7.tar.gz samba-3b3e21bd9ba701a97e752205263a7903619541c7.tar.bz2 samba-3b3e21bd9ba701a97e752205263a7903619541c7.zip | |
Convert Samba3 to use the common lib/util/charset API
This removes calls to push_*_allocate() and pull_*_allocate(), as well
as convert_string_allocate, as they are not in the common API
To allow transition to a common charcnv in future, provide Samba4-like
strupper functions in source3/lib/charcnv.c
(the actual implementation remains distinct, but the API is now shared)
Andrew Bartlett
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index b706721e77..35ce8bb41a 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1711,22 +1711,22 @@ static NTSTATUS ldapsam_modify_entry(struct pdb_methods *my_methods, } } - if (!push_utf8_allocate(&utf8_password, + if (!push_utf8_talloc(talloc_tos(), &utf8_password, pdb_get_plaintext_passwd(newpwd), &converted_size)) { return NT_STATUS_NO_MEMORY; } - if (!push_utf8_allocate(&utf8_dn, dn, &converted_size)) { - SAFE_FREE(utf8_password); + if (!push_utf8_talloc(talloc_tos(), &utf8_dn, dn, &converted_size)) { + TALLOC_FREE(utf8_password); return NT_STATUS_NO_MEMORY; } if ((ber = ber_alloc_t(LBER_USE_DER))==NULL) { DEBUG(0,("ber_alloc_t returns NULL\n")); - SAFE_FREE(utf8_password); - SAFE_FREE(utf8_dn); + TALLOC_FREE(utf8_password); + TALLOC_FREE(utf8_dn); return NT_STATUS_UNSUCCESSFUL; } @@ -1736,21 +1736,21 @@ static NTSTATUS ldapsam_modify_entry(struct pdb_methods *my_methods, (ber_printf (ber, "n}") < 0)) { DEBUG(0,("ldapsam_modify_entry: ber_printf returns a value <0\n")); ber_free(ber,1); - SAFE_FREE(utf8_dn); - SAFE_FREE(utf8_password); + TALLOC_FREE(utf8_dn); + TALLOC_FREE(utf8_password); return NT_STATUS_UNSUCCESSFUL; } if ((rc = ber_flatten (ber, &bv))<0) { DEBUG(0,("ldapsam_modify_entry: ber_flatten returns a value <0\n")); ber_free(ber,1); - SAFE_FREE(utf8_dn); - SAFE_FREE(utf8_password); + TALLOC_FREE(utf8_dn); + TALLOC_FREE(utf8_password); return NT_STATUS_UNSUCCESSFUL; } - SAFE_FREE(utf8_dn); - SAFE_FREE(utf8_password); + TALLOC_FREE(utf8_dn); + TALLOC_FREE(utf8_password); ber_free(ber, 1); if (!ldap_state->is_nds_ldap) { |