svn commit: samba r14692 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: . Samba4/NDR

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-24 14:22:33 +0000 (Fri, 24 Mar 2006)
New Revision: 14692

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

Log:
Get rid of the obfuscation() attribute

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Compat.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Compat.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Compat.pm	2006-03-24 14:13:02 UTC (rev 14691)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Compat.pm	2006-03-24 14:22:33 UTC (rev 14692)
@@ -124,10 +124,6 @@
 		warning($e, "compression() property not supported");
 	}
 
-	if (has_property($e, "obfuscation")) {
-		warning($e, "obfuscation() property not supported");
-	}
-
 	if (has_property($e, "sptr")) {
 		warning($e, "sptr() pointer property not supported");
 	}

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm	2006-03-24 14:13:02 UTC (rev 14691)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm	2006-03-24 14:22:33 UTC (rev 14692)
@@ -232,7 +232,6 @@
 			SUBCONTEXT_SIZE => $subsize,
 			IS_DEFERRED => $is_deferred,
 			COMPRESSION => has_property($e, "compression"),
-			OBFUSCATION => has_property($e, "obfuscation")
 		});
 	}
 
@@ -805,7 +804,6 @@
 	"subcontext"		=> ["ELEMENT"],
 	"subcontext_size"	=> ["ELEMENT"],
 	"compression"		=> ["ELEMENT"],
-	"obfuscation"		=> ["ELEMENT"],
 
 	# enum
 	"enum8bit"		=> ["TYPEDEF"],
@@ -929,10 +927,6 @@
 		fatal($e, el_name($e) . " : compression() on non-subcontext element");
 	}
 
-	if (defined (has_property($e, "obfuscation")) and not defined(has_property($e, "subcontext"))) {
-		fatal($e, el_name($e) . " : obfuscation() on non-subcontext element");
-	}
-
 	if (!$e->{POINTERS} && (
 		has_property($e, "ptr") or
 		has_property($e, "sptr") or

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-24 14:13:02 UTC (rev 14691)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-03-24 14:22:33 UTC (rev 14692)
@@ -464,42 +464,6 @@
 	pidl "}";
 }
 
-sub ParseObfuscationPushStart($$)
-{
-	my ($e,$ndr) = @_;
-	my $obfuscation = has_property($e, "obfuscation");
-
-	pidl "NDR_CHECK(ndr_push_obfuscation_start($ndr, $obfuscation));";
-
-	return $ndr;
-}
-
-sub ParseObfuscationPushEnd($$)
-{
-	my ($e,$ndr) = @_;
-	my $obfuscation = has_property($e, "obfuscation");
-
-	pidl "NDR_CHECK(ndr_push_obfuscation_end($ndr, $obfuscation));";
-}
-
-sub ParseObfuscationPullStart($$)
-{
-	my ($e,$ndr) = @_;
-	my $obfuscation = has_property($e, "obfuscation");
-
-	pidl "NDR_CHECK(ndr_pull_obfuscation_start($ndr, $obfuscation));";
-
-	return $ndr;
-}
-
-sub ParseObfuscationPullEnd($$)
-{
-	my ($e,$ndr) = @_;
-	my $obfuscation = has_property($e, "obfuscation");
-
-	pidl "NDR_CHECK(ndr_pull_obfuscation_end($ndr, $obfuscation));";
-}
-
 sub ParseSubcontextPushStart($$$$)
 {
 	my ($e,$l,$ndr,$env) = @_;
@@ -515,10 +479,6 @@
 		$subndr = ParseCompressionPushStart($e, $l, $subndr, $env);
 	}
 
-	if (defined $l->{OBFUSCATION}) {
-		$subndr = ParseObfuscationPushStart($e, $subndr);
-	}
-
 	return $subndr;
 }
 
@@ -532,10 +492,6 @@
 		ParseCompressionPushEnd($e, $l, $subndr, $env);
 	}
 
-	if (defined $l->{OBFUSCATION}) {
-		ParseObfuscationPushEnd($e, $subndr);
-	}
-
 	pidl "NDR_CHECK(ndr_push_subcontext_end($ndr, $subndr, $l->{HEADER_SIZE}, $subcontext_size));";
 	deindent;
 	pidl "}";
@@ -556,10 +512,6 @@
 		$subndr = ParseCompressionPullStart($e, $l, $subndr, $env);
 	}
 
-	if (defined $l->{OBFUSCATION}) {
-		$subndr = ParseObfuscationPullStart($e, $subndr);
-	}
-	
 	return $subndr;
 }
 
@@ -573,10 +525,6 @@
 		ParseCompressionPullEnd($e, $l, $subndr, $env);
 	}
 
-	if (defined $l->{OBFUSCATION}) {
-		ParseObfuscationPullEnd($e, $subndr);
-	}
-
 	pidl "NDR_CHECK(ndr_pull_subcontext_end($ndr, $subndr, $l->{HEADER_SIZE}, $subcontext_size));";
 	deindent;
 	pidl "}";
@@ -2351,10 +2299,6 @@
 		pidl choose_header("librpc/ndr/ndr_compression.h", "ndr/compression.h");
 	}
 
-	if ($needed->{"obfuscate"}) {
-		pidl "#include \"ndr_obfuscate.h\"";
-	}
-	
 	HeaderInterface($interface);
 
 	# Typedefs
@@ -2472,9 +2416,6 @@
 			if (has_property($e, "compression")) { 
 				$needed->{"compression"} = 1;
 			}
-			if (has_property($e, "obfuscation")) {
-				$needed->{"obfuscate"} = 1;
-			}
 			if ($needed->{"pull_$t->{NAME}"} and
 				not defined($needed->{"pull_$e->{TYPE}"})) {
 				$needed->{"pull_$e->{TYPE}"} = 1;