[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  7bcd9c5... libndr: add support for relative_rap_convert.
      from  49a80fe... s3-waf: Fix typo

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7bcd9c5583ac2f750aa9c90af7d1ac86eb36f86f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 30 01:08:07 2010 +0200

    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

-----------------------------------------------------------------------

Summary of changes:
 librpc/ndr/libndr.h    |    1 +
 librpc/ndr/ndr_basic.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 133a119..d5091a6 100644
--- 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 f7d6ee0..d0d58b0 100644
--- 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;
 }
 


-- 
Samba Shared Repository