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/libads/ldap.c | |
| parent | 4786a493f70070dce6de4cbe488c9de1bdbb75ad (diff) | |
| download | samba-3b3e21bd9ba701a97e752205263a7903619541c7.tar.gz samba-3b3e21bd9ba701a97e752205263a7903619541c7.tar.xz 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/libads/ldap.c')
| -rw-r--r-- | source3/libads/ldap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 841ea8caae4..9ffbd57e4a1 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -1500,7 +1500,7 @@ ADS_STATUS ads_gen_mod(ADS_STRUCT *ads, const char *mod_dn, ADS_MODLIST mods) controls[0] = &PermitModify; controls[1] = NULL; - if (!push_utf8_allocate(&utf8_dn, mod_dn, &converted_size)) { + if (!push_utf8_talloc(talloc_tos(), &utf8_dn, mod_dn, &converted_size)) { return ADS_ERROR_NT(NT_STATUS_NO_MEMORY); } @@ -1510,7 +1510,7 @@ ADS_STATUS ads_gen_mod(ADS_STRUCT *ads, const char *mod_dn, ADS_MODLIST mods) mods[i] = NULL; ret = ldap_modify_ext_s(ads->ldap.ld, utf8_dn, (LDAPMod **) mods, controls, NULL); - SAFE_FREE(utf8_dn); + TALLOC_FREE(utf8_dn); return ADS_ERROR(ret); } @@ -1527,8 +1527,8 @@ ADS_STATUS ads_gen_add(ADS_STRUCT *ads, const char *new_dn, ADS_MODLIST mods) char *utf8_dn = NULL; size_t converted_size; - if (!push_utf8_allocate(&utf8_dn, new_dn, &converted_size)) { - DEBUG(1, ("ads_gen_add: push_utf8_allocate failed!")); + if (!push_utf8_talloc(talloc_tos(), &utf8_dn, new_dn, &converted_size)) { + DEBUG(1, ("ads_gen_add: push_utf8_talloc failed!")); return ADS_ERROR_NT(NT_STATUS_NO_MEMORY); } @@ -1538,7 +1538,7 @@ ADS_STATUS ads_gen_add(ADS_STRUCT *ads, const char *new_dn, ADS_MODLIST mods) mods[i] = NULL; ret = ldap_add_s(ads->ldap.ld, utf8_dn, (LDAPMod**)mods); - SAFE_FREE(utf8_dn); + TALLOC_FREE(utf8_dn); return ADS_ERROR(ret); } @@ -1553,13 +1553,13 @@ ADS_STATUS ads_del_dn(ADS_STRUCT *ads, char *del_dn) int ret; char *utf8_dn = NULL; size_t converted_size; - if (!push_utf8_allocate(&utf8_dn, del_dn, &converted_size)) { - DEBUG(1, ("ads_del_dn: push_utf8_allocate failed!")); + if (!push_utf8_talloc(talloc_tos(), &utf8_dn, del_dn, &converted_size)) { + DEBUG(1, ("ads_del_dn: push_utf8_talloc failed!")); return ADS_ERROR_NT(NT_STATUS_NO_MEMORY); } ret = ldap_delete_s(ads->ldap.ld, utf8_dn); - SAFE_FREE(utf8_dn); + TALLOC_FREE(utf8_dn); return ADS_ERROR(ret); } |