From 01d23b0e5454f317c1529fed829d24a32fdcc44d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 9 Oct 2005 13:53:48 +0000
Subject: r10849: Fix handling of [charset] for strings with fixed or "inline"
 size (This used to be commit 3c2558d11ec1d0b41e5b36b793d9e64db2e203b6)

---
 source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'source4/pidl')

diff --git a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm
index 3f08cbb527..da60a02059 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm
@@ -575,8 +575,7 @@ sub ParseElementPushLevel
 
 	my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred);
 
-	if ($l->{TYPE} eq "ARRAY" and ($l->{IS_CONFORMANT} or $l->{IS_VARYING} 
-		or is_charset_array($e, $l))) {
+	if ($l->{TYPE} eq "ARRAY" and ($l->{IS_CONFORMANT} or $l->{IS_VARYING})) {
 		$var_name = get_pointer_to($var_name);
 	}
 
@@ -721,8 +720,7 @@ sub ParseElementPrint($$$)
 		} elsif ($l->{TYPE} eq "ARRAY") {
 			my $length;
 
-			if ($l->{IS_CONFORMANT} or $l->{IS_VARYING} or 
-				is_charset_array($e,$l)) { 
+			if ($l->{IS_CONFORMANT} or $l->{IS_VARYING}) {
 				$var_name = get_pointer_to($var_name); 
 			}
 			
@@ -927,8 +925,7 @@ sub ParseElementPullLevel
 
 	my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred);
 
-	if ($l->{TYPE} eq "ARRAY" and ($l->{IS_VARYING} or $l->{IS_CONFORMANT} 
-		or is_charset_array($e,$l))) {
+	if ($l->{TYPE} eq "ARRAY" and ($l->{IS_VARYING} or $l->{IS_CONFORMANT})) {
 		$var_name = get_pointer_to($var_name);
 	}
 
-- 
cgit