[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  3466433 pidl:Typelist: fix perl warnings about recursiv function calls
       via  4b068bb pidl:Samba3/ServerNDR: correctly initialise ndr_push struct
      from  3272e16 Missed one debug printf of name_hash. Ensure always use %x.

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


- Log -----------------------------------------------------------------
commit 34664338f3c0bd9acbb2ada3d92d482e30cbdf1c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 26 08:48:34 2011 +0100

    pidl:Typelist: fix perl warnings about recursiv function calls
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Jan 26 10:59:04 CET 2011 on sn-devel-104

commit 4b068bb91994a0fc3a76abd45bff4e2fe53e9a34
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 25 19:46:18 2011 +0100

    pidl:Samba3/ServerNDR: correctly initialise ndr_push struct
    
    We need to copy the ptr_count from the ndr_pull struct to the ndr_push struct,
    otherwise we'll reuse full pointer ids, which will cause the client to
    fail in the ndr unmarshalling.
    
    metze

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

Summary of changes:
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |    6 ++++++
 pidl/lib/Parse/Pidl/Typelist.pm         |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 0ebccf5..64a4ec5 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -199,6 +199,12 @@ sub ParseFunction($$)
 	pidl "\treturn false;";
 	pidl "}";
 	pidl "";
+	pidl "/*";
+	pidl " * carry over the pointer count to the reply in case we are";
+	pidl " * using full pointer. See NDR specification for full pointers";
+	pidl " */";
+	pidl "push->ptr_count = pull->ptr_count;";
+	pidl "";
 	pidl "ndr_err = call->ndr_push(push, NDR_OUT, r);";
 	pidl "if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {";
 	pidl "\ttalloc_free(r);";
diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 4733f91..a89b1a7 100644
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -128,6 +128,7 @@ sub getType($)
 	return $types{$t};
 }
 
+sub typeIs($$);
 sub typeIs($$)
 {
 	my ($t,$tt) = @_;


-- 
Samba Shared Repository