Support restricted.

diff --git a/source4/librpc/idl/wmi.idl b/source4/librpc/idl/wmi.idl
index 8b3fda3b404a7dd5f6a9facaa058151fb5feee49..8d2e31b6f03a029dd3f8330e99a37c651886bd19 100644 (file)
--- a/source4/librpc/idl/wmi.idl
+++ b/source4/librpc/idl/wmi.idl
@@ -16,8 +16,11 @@ import "misc.idl";
 
 };
 
-[local, object, uuid("dc12a681-737f-11cf-884d-00aa004b2e24")]
-
+[
+       local, 
+       object, 
+       uuid("dc12a681-737f-11cf-884d-00aa004b2e24")
+]
 interface IWbemClassObject : IUnknown
 {
 
@@ -584,7 +587,7 @@ coclass WbemClassObject
         );
 
     WERROR NextAsync(
-        [in]  uint32 uCount
+        [in]  uint32 uCount,
         [in]  IWbemObjectSink* pSink
         );
 
@@ -760,12 +763,12 @@ coclass WbemClassObject
 {
        WERROR GetResultObject(
                                                   [in]  long lTimeout,
-                                                  [out] IUnknown** ppResultObject
+                                                  [out] IUnknown** ppResultObject,
                                                   [out] IWbemClassObject** ppResultObject
                                                  );
 
        WERROR GetResultString(
-                                                  [in]  long lTimeout
+                                                  [in]  long lTimeout,
                                                   [out] BSTR* pstrResultString
                                                  );
 

diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm
index 5eb5cbc195e38c42ca63228b77074fc1ed9f4864..9b61a370e219efb1ebabfb4a9abbaec7c6fcc141 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/NDR.pm
@@ -856,6 +856,7 @@ my %property_list = (
        "pointer_default"       => ["INTERFACE"],
        "helper"                => ["INTERFACE"],
        "authservice"           => ["INTERFACE"],
+       "restricted"    => ["INTERFACE"],
 
        # dcom
        "object"                => ["INTERFACE"],

diff --git a/source4/pidl/lib/Parse/Pidl/ODL.pm b/source4/pidl/lib/Parse/Pidl/ODL.pm
index f6df34afa8937caf50c550ad77793819018b25d5..5c2cc8bfbf09b6456d81374e558db3f40df8ba43 100644 (file)
--- a/source4/pidl/lib/Parse/Pidl/ODL.pm
+++ b/source4/pidl/lib/Parse/Pidl/ODL.pm
@@ -110,6 +110,7 @@ sub ODL2IDL
                LINE => undef
        }) if ($addedorpc);
 
+
        return $odl;
 }
 

diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index 0a6b0a97ca1c98d0b1799af3e9cee997f0799724..e58442ba1b696edb0eb84b0cad392ac720dd1aa7 100755 (executable)
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -612,10 +612,11 @@ sub process_file($)
 
                $pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs);
                defined @$pidl || die "Failed to parse $idl_file";
-               require Parse::Pidl::Typelist;
-               Parse::Pidl::Typelist::LoadIdl($pidl);
        }
-       
+
+       require Parse::Pidl::Typelist;
+       Parse::Pidl::Typelist::LoadIdl($pidl);
+
        if (defined($opt_dump_idl_tree)) {
                my($pidl_file) = ($opt_dump_idl_tree or "$outputdir/$basename.pidl");
                SaveStructure($pidl_file, $pidl) or die "Failed to save $pidl_file\n";