diff options
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/blob.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/nttrans.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/request.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb2/fileio.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c index bd250361a4..baa9b3e4d8 100644 --- a/source4/smb_server/blob.c +++ b/source4/smb_server/blob.c @@ -140,10 +140,10 @@ size_t smbsrv_blob_push_string(TALLOC_CTX *mem_ctx, alignment = 1; if (dest_len > 0) { SCVAL(blob->data + offset, 0, 0); - ret = push_string(lp_iconv_convenience(global_loadparm), blob->data + offset + 1, str, dest_len-1, flags); + ret = push_string(blob->data + offset + 1, str, dest_len-1, flags); } } else { - ret = push_string(lp_iconv_convenience(global_loadparm), blob->data + offset, str, dest_len, flags); + ret = push_string(blob->data + offset, str, dest_len, flags); } /* sometimes the string needs to be terminated, but the length 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); diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c index 4f4402ba33..221fafadfd 100644 --- a/source4/smb_server/smb2/fileio.c +++ b/source4/smb_server/smb2/fileio.c @@ -458,7 +458,7 @@ static void smb2srv_notify_send(struct ntvfs_request *ntvfs) ssize_t len; SIVAL(p, 4, io->smb2.out.changes[i].action); - len = push_string(lp_iconv_convenience(ntvfs->ctx->lp_ctx), p + 12, io->smb2.out.changes[i].name.s, + len = push_string(p + 12, io->smb2.out.changes[i].name.s, blob.length - (p+12 - blob.data), STR_UNICODE); SIVAL(p, 8, len); |