summaryrefslogtreecommitdiff
path: root/source4/librpc/ndr/ndr.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-22 11:49:22 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-22 11:49:22 +0000
commitbe77d9c60d17e0ef2ed0b51ea0814c42a41a40a3 (patch)
treef7c66a83daa4a555a7029a54b2fc7886ad1f0d91 /source4/librpc/ndr/ndr.c
parent677fb26deba2e8b8965c41d7b7455063db031a2c (diff)
downloadsamba-be77d9c60d17e0ef2ed0b51ea0814c42a41a40a3.tar.gz
samba-be77d9c60d17e0ef2ed0b51ea0814c42a41a40a3.tar.bz2
samba-be77d9c60d17e0ef2ed0b51ea0814c42a41a40a3.zip
* fixed null terminated string handling
* fixed nested relative offsets in push functions the spoolss torture test now passes! (This used to be commit 60ced76160e4f4e2b511ebbeec31130c8ebcdd22)
Diffstat (limited to 'source4/librpc/ndr/ndr.c')
-rw-r--r--source4/librpc/ndr/ndr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index f22145af97..44472147fd 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -727,7 +727,7 @@ NTSTATUS ndr_push_relative(struct ndr_push *ndr, int ndr_flags, const void *p,
NDR_CHECK(ndr_push_align(ndr, 8));
ndr_push_save(ndr, &save);
ndr->offset = ofs->offset;
- NDR_CHECK(ndr_push_uint32(ndr, save.offset + ndr->ofs_list->offset));
+ NDR_CHECK(ndr_push_uint32(ndr, save.offset - ndr->ofs_list->offset));
ndr_push_restore(ndr, &save);
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
}