summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 14:26:46 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 14:26:46 +0200
commit37d885c51a559d2be7dd15f46a80027e4f1dffef (patch)
tree5e6fd2f9fb3463f8694ee9b6b022d0878737e0e6 /source4/smb_server
parent284f523ec70477c408887a478e8392671f12dfff (diff)
downloadsamba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.gz
samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.bz2
samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.zip
Remove iconv_convenience argument from convert_string{,talloc}() but
make them wrappers around convert_string{,talloc}_convenience().
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb/request.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 52eb69fe68..2cfd6d4f79 100644
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -514,7 +514,7 @@ static size_t req_pull_ucs2(struct request_bufinfo *bufinfo, const char **dest,
return src_len2 + alignment;
}
- ret = convert_string_talloc(bufinfo->mem_ctx, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, src, src_len2, (void **)&dest2);
+ ret = convert_string_talloc(bufinfo->mem_ctx, CH_UTF16, CH_UNIX, src, src_len2, (void **)&dest2);
if (ret == -1) {
*dest = NULL;
@@ -563,7 +563,7 @@ static size_t req_pull_ascii(struct request_bufinfo *bufinfo, const char **dest,
src_len2++;
}
- ret = convert_string_talloc(bufinfo->mem_ctx, lp_iconv_convenience(global_loadparm), CH_DOS, CH_UNIX, src, src_len2, (void **)&dest2);
+ ret = convert_string_talloc(bufinfo->mem_ctx, CH_DOS, CH_UNIX, src, src_len2, (void **)&dest2);
if (ret == -1) {
*dest = NULL;