libndr: add support for relative_rap_convert.

Will not harm anyone, is only used for rare short (2byte) relative pointers, and
relative_rap_convert is always 0 so far (as all init functions using struct
ndr_pull will zero the struct).

Guenther

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 133a119069cb59eb006e1e09459cbc1fce4404f2..d5091a6619b4d9054bba14804593d01d702dd5d3 100644 (file)
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -62,6 +62,7 @@ struct ndr_pull {
 
        uint32_t relative_highest_offset;
        uint32_t relative_base_offset;
+       uint32_t relative_rap_convert;
        struct ndr_token_list *relative_base_list;
 
        struct ndr_token_list *relative_list;

diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c
index f7d6ee04498bb8e7f6823c079d1f46a1f0457def..d0d58b088448b6b83a3ae73d0bab55dbb7ce7111 100644 (file)
--- a/librpc/ndr/ndr_basic.c
+++ b/librpc/ndr/ndr_basic.c
@@ -185,6 +185,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_relative_ptr_short(struct ndr_pull *ndr, uin
        if (*v != 0) {
                ndr->ptr_count++;
        }
+       *(v) -= ndr->relative_rap_convert;
        return NDR_ERR_SUCCESS;
 }