diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 03:40:09 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 03:40:09 +0200 |
| commit | 922a29992ee38b8e1c851192677b89a2cd59a91a (patch) | |
| tree | 9ea2826f7fd77b27d16de8be61ca7940fb066bad /source4/smb_server/smb | |
| parent | 23b04a31f14dca0a3f9bcd58181f84db4b6092c7 (diff) | |
| download | samba-922a29992ee38b8e1c851192677b89a2cd59a91a.tar.gz samba-922a29992ee38b8e1c851192677b89a2cd59a91a.tar.bz2 samba-922a29992ee38b8e1c851192677b89a2cd59a91a.zip | |
Remove iconv_convenience parameter from simple string push/pull
functions.
Diffstat (limited to 'source4/smb_server/smb')
| -rw-r--r-- | source4/smb_server/smb/nttrans.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/request.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c index 4a06ea4b91..3480711ed2 100644 --- a/source4/smb_server/smb/nttrans.c +++ b/source4/smb_server/smb/nttrans.c @@ -398,7 +398,7 @@ static NTSTATUS nttrans_notify_change_send(struct nttrans_op *op) ssize_t len; SIVAL(p, 4, info->nttrans.out.changes[i].action); - len = push_string(lp_iconv_convenience(global_loadparm), p + 12, info->nttrans.out.changes[i].name.s, + len = push_string(p + 12, info->nttrans.out.changes[i].name.s, op->trans->out.params.length - (p+12 - op->trans->out.params.data), STR_UNICODE); SIVAL(p, 8, len); diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c index 241c262857..52eb69fe68 100644 --- a/source4/smb_server/smb/request.c +++ b/source4/smb_server/smb/request.c @@ -428,7 +428,7 @@ size_t req_push_str(struct smbsrv_request *req, uint8_t *dest, const char *str, dest = req->out.buffer + PTR_DIFF(dest, buf0); } - len = push_string(lp_iconv_convenience(req->smb_conn->lp_ctx), dest, str, len, flags); + len = push_string(dest, str, len, flags); grow_size = len + PTR_DIFF(dest, req->out.data); |