Merge branch 'master' of ssh://git.samba.org/data/git/abartlet/samba into extended...

[abartlet/samba.git/.git] / pidl / lib / Parse / Pidl / Samba3 / ServerNDR.pm

diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 6034fb6f160ecdef84152cc2612f3282638cd1b5..eb3cdf20cb060d2c18fb19abcae946c109bf38c4 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -142,6 +142,13 @@ sub ParseFunction($$)
                my @dir = @{$_->{DIRECTION}};
                if (grep(/in/, @dir) and grep(/out/, @dir)) {
                        pidl "r->out.$_->{NAME} = r->in.$_->{NAME};";
+               }
+       }
+
+       foreach (@{$fn->{ELEMENTS}}) {
+               my @dir = @{$_->{DIRECTION}};
+               if (grep(/in/, @dir) and grep(/out/, @dir)) {
+                       # noop
                } elsif (grep(/out/, @dir) and not
                                 has_property($_, "represent_as")) {
                        AllocOutVar($_, "r", "r->out.$_->{NAME}", $env);
@@ -205,7 +212,11 @@ sub ParseInterface($)
 
        pidl_hdr "#ifndef __SRV_$uif\__";
        pidl_hdr "#define __SRV_$uif\__";
-       ParseFunction($if, $_) foreach (@{$if->{FUNCTIONS}});
+
+       foreach (@{$if->{FUNCTIONS}}) {
+               next if ($_->{PROPERTIES}{noopnum});
+               ParseFunction($if, $_);
+       }
 
        pidl "";
        pidl "/* Tables */";
@@ -214,6 +225,7 @@ sub ParseInterface($)
        indent;
 
        foreach (@{$if->{FUNCTIONS}}) {
+               next if ($_->{PROPERTIES}{noopnum});
                pidl "{\"" . uc($_->{NAME}) . "\", NDR_" . uc($_->{NAME}) . ", api_$_->{NAME}},";
        }