diff options
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Compat.pm | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/NDR.pm | 6 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 59 |
3 files changed, 0 insertions, 69 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Compat.pm b/source4/pidl/lib/Parse/Pidl/Compat.pm index f0b8cc7b0b..944193ac1b 100644 --- a/source4/pidl/lib/Parse/Pidl/Compat.pm +++ b/source4/pidl/lib/Parse/Pidl/Compat.pm @@ -124,10 +124,6 @@ sub CheckElement($) 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"); } diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm index c8a9717889..1efd0694e5 100644 --- a/source4/pidl/lib/Parse/Pidl/NDR.pm +++ b/source4/pidl/lib/Parse/Pidl/NDR.pm @@ -232,7 +232,6 @@ sub GetElementLevelTable($) SUBCONTEXT_SIZE => $subsize, IS_DEFERRED => $is_deferred, COMPRESSION => has_property($e, "compression"), - OBFUSCATION => has_property($e, "obfuscation") }); } @@ -805,7 +804,6 @@ my %property_list = ( "subcontext" => ["ELEMENT"], "subcontext_size" => ["ELEMENT"], "compression" => ["ELEMENT"], - "obfuscation" => ["ELEMENT"], # enum "enum8bit" => ["TYPEDEF"], @@ -929,10 +927,6 @@ sub ValidElement($) 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 diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index e3058665f2..f29518d21f 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -464,42 +464,6 @@ sub ParseCompressionPullEnd($$$$) 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 @@ sub ParseSubcontextPushStart($$$$) $subndr = ParseCompressionPushStart($e, $l, $subndr, $env); } - if (defined $l->{OBFUSCATION}) { - $subndr = ParseObfuscationPushStart($e, $subndr); - } - return $subndr; } @@ -532,10 +492,6 @@ sub ParseSubcontextPushEnd($$$$) 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 @@ sub ParseSubcontextPullStart($$$$) $subndr = ParseCompressionPullStart($e, $l, $subndr, $env); } - if (defined $l->{OBFUSCATION}) { - $subndr = ParseObfuscationPullStart($e, $subndr); - } - return $subndr; } @@ -573,10 +525,6 @@ sub ParseSubcontextPullEnd($$$$) 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 @@ sub ParseInterface($$) 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 @@ sub NeededTypedef($$) 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; |