From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 26 Sep 2013 05:44:42 +0000 (+0200)
Subject: Revert "ndr_pull_frstrans_Update"
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=f813e6514c9a4ac6e18496e0ad6ae15c32b16a08;hp=1e72330e9243783d87836824a913a9e7568c4842;p=metze%2Fsamba%2Fwip.git

Revert "ndr_pull_frstrans_Update"

This reverts commit e06d8b4c8d2f8166ab69874fd3a55e4e96c0793c.
---

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 1d102d8aec83..432e52f89c45 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -449,7 +449,7 @@ sub ParseArrayPullHeader($$$$$$)
 		$self->defer("}");
 	}
 
-	if ($l->{IS_CONFORMANT} and $l->{IS_VARYING} and (defined($l->{LENGTH_IS}) or not $l->{IS_ZERO_TERMINATED})) {
+	if ($l->{IS_VARYING} and (defined($l->{LENGTH_IS}) or not $l->{IS_ZERO_TERMINATED})) {
 		$self->defer("if ($var_name) {");
 		$self->defer_indent;
 		my $length = ParseExprExt($l->{LENGTH_IS}, $env, $e->{ORIGINAL},