summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-02 14:45:40 +0000
committerJelmer Vernooij <jelmer@samba.org>2005-09-02 14:45:40 +0000
commitd05e229ecb708d941b4d756bf65a755a129eaaf8 (patch)
tree1e19dfbab63644c7f3e83387562c6b8b319c5e3e /source/lib
parent6e498666a65eace839504b02aab3d596fcdfae6c (diff)
downloadsamba-d05e229ecb708d941b4d756bf65a755a129eaaf8.tar.gz
samba-d05e229ecb708d941b4d756bf65a755a129eaaf8.tar.xz
samba-d05e229ecb708d941b4d756bf65a755a129eaaf8.zip
r9959: Fix bug where data offset was incorrect after parsing element with
[charset]
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/tdr/tdr.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/source/lib/tdr/tdr.c b/source/lib/tdr/tdr.c
index 1d859fdcd53..c16a05ecf02 100644
--- a/source/lib/tdr/tdr.c
+++ b/source/lib/tdr/tdr.c
@@ -43,23 +43,6 @@
#define TDR_SIVAL(tdr, ofs, v) do { if (TDR_BE(tdr)) { RSIVAL(tdr->data.data,ofs,v); } else SIVAL(tdr->data.data,ofs,v); } while (0)
#define TDR_SIVALS(tdr, ofs, v) do { if (TDR_BE(tdr)) { RSIVALS(tdr->data.data,ofs,v); } else SIVALS(tdr->data.data,ofs,v); } while (0)
-struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob)
-{
- struct tdr_pull *tdr = talloc_zero(mem_ctx, struct tdr_pull);
- tdr->data = *blob;
- return tdr;
-}
-
-struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx)
-{
- return talloc_zero(mem_ctx, struct tdr_push);
-}
-
-struct tdr_print *tdr_print_init(TALLOC_CTX *mem_ctx)
-{
- return talloc_zero(mem_ctx, struct tdr_print);
-}
-
/*
expand the available space in the buffer to 'size'
*/
@@ -166,6 +149,8 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, const char **v, uint32_t length,
return NT_STATUS_INVALID_PARAMETER;
}
+ tdr->offset += length * el_size;
+
return NT_STATUS_OK;
}