svn commit: samba r7118 - in branches/SAMBA_4_0/source/build/pidl: .

[metze at samba.org]

Author: metze
Date: 2005-05-30 17:58:12 +0000 (Mon, 30 May 2005)
New Revision: 7118

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7118

Log:
allways pull scalars and buffers when pulling the subcontext context
(this, is not the full fix, still doesn't work :-( )

metze
Modified:
   branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm	2005-05-30 16:50:32 UTC (rev 7117)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm	2005-05-30 17:58:12 UTC (rev 7118)
@@ -601,9 +601,9 @@
 	my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred);
 
 	if (defined($ndr_flags)) {
-	    if ($l->{TYPE} eq "SUBCONTEXT") {
+		if ($l->{TYPE} eq "SUBCONTEXT") {
 			$ndr = ParseSubcontextPushStart($e, $l, $ndr, $var_name, $ndr_flags);
-			ParseElementPushLevel($e, Ndr::GetNextLevel($e, $l), $ndr, $var_name, $env, $primitives, $deferred);
+			ParseElementPushLevel($e, Ndr::GetNextLevel($e, $l), $ndr, $var_name, $env, 1, 1);
 			ParseSubcontextPushEnd($e, $l, $ndr_flags);
 		} elsif ($l->{TYPE} eq "POINTER") {
 			ParsePtrPush($e, $l, $var_name);
@@ -923,9 +923,9 @@
 	# Only pull something if there's actually something to be pulled
 	if (defined($ndr_flags)) {
 		if ($l->{TYPE} eq "SUBCONTEXT") {
-				($ndr,$var_name) = ParseSubcontextPullStart($e, $l, $ndr, $var_name, $ndr_flags, $env);
-				ParseElementPullLevel($e,Ndr::GetNextLevel($e,$l), $ndr, $var_name, $env, $primitives, $deferred);
-				ParseSubcontextPullEnd($e, $l);
+			($ndr,$var_name) = ParseSubcontextPullStart($e, $l, $ndr, $var_name, $ndr_flags, $env);
+			ParseElementPullLevel($e,Ndr::GetNextLevel($e,$l), $ndr, $var_name, $env, 1, 1);
+			ParseSubcontextPullEnd($e, $l);
 		} elsif ($l->{TYPE} eq "ARRAY") {
 			my $length = ParseArrayPullHeader($e, $l, $ndr, $var_name, $env);