r15653: Remove idl_types.h include where possible. Remove

types from .h file that are now in pidls' aliases list.

diff --git a/source/librpc/idl/atsvc.idl b/source/librpc/idl/atsvc.idl
index e1eb46e7e01e4c359a2b0c4bc5fe97e387e533fb..d58a71965191fa5310848d1cf4ff8e7dc0c1e218 100644 (file)
--- a/source/librpc/idl/atsvc.idl
+++ b/source/librpc/idl/atsvc.idl
@@ -2,8 +2,6 @@
   atsvc interface definition
 */
 
-#include "idl_types.h"
-
 [ uuid("1ff70682-0a51-30e8-076d-740be8cee98b"),
   version(1.0),
   pointer_default(unique),

diff --git a/source/librpc/idl/dcom.idl b/source/librpc/idl/dcom.idl
index 7b40461c16d75551459890a1a962169e43b8e874..ce10c98c0ae48a0d58d0410346c032e071183255 100644 (file)
--- a/source/librpc/idl/dcom.idl
+++ b/source/librpc/idl/dcom.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /**
   DCOM interfaces
   http://www.ietf.org/internet-drafts/draft-brown-dcom-v1-spec-04.txt

diff --git a/source/librpc/idl/dfs.idl b/source/librpc/idl/dfs.idl
index 288dd39f2e5eb62eb090213acdfaabd8f2a39d2a..ef3d2ca604e70c92459f324f212084c0e75f0913 100644 (file)
--- a/source/librpc/idl/dfs.idl
+++ b/source/librpc/idl/dfs.idl
@@ -2,8 +2,6 @@
   dfs interface definition
 */
 
-#include "idl_types.h"
-
 [ uuid("4fc742e0-4a10-11cf-8273-00aa004ae673"),
   version(3.0),
   pointer_default(unique),

diff --git a/source/librpc/idl/dnsserver.idl b/source/librpc/idl/dnsserver.idl
index dca86d58209ea227b7daced58faf36b17e0ef0ff..86a8a14f1326aa645512cd3ff134b884ab795bd1 100644 (file)
--- a/source/librpc/idl/dnsserver.idl
+++ b/source/librpc/idl/dnsserver.idl
@@ -2,8 +2,6 @@
   dnsserver interface definition
 */
 
-#include "idl_types.h"
-
 [ uuid("50abc2a4-574d-40b3-9d66-ee4fd5fba076"),
   version(5.0),
   pointer_default(unique),

diff --git a/source/librpc/idl/dssetup.idl b/source/librpc/idl/dssetup.idl
index 818460fbba3b5b5d65d9ccbcb165537d5bcec311..9c490aebe3d4db20fcfd4c55f97debe1a0c9df10 100644 (file)
--- a/source/librpc/idl/dssetup.idl
+++ b/source/librpc/idl/dssetup.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   dssetup interface definition
 */

diff --git a/source/librpc/idl/echo.idl b/source/librpc/idl/echo.idl
index 4fe3d872e332cbef4f34ea9663164ef14c952192..7b80e3e29692b57404167694a9e63d80750c4174 100644 (file)
--- a/source/librpc/idl/echo.idl
+++ b/source/librpc/idl/echo.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 
 [
   uuid("60a15ec5-4de8-11d7-a637-005056a20182"),

diff --git a/source/librpc/idl/efs.idl b/source/librpc/idl/efs.idl
index c58b72a401e303e4ece22c28cfec9595ed5c3ecd..75d997a0184caa545fd7b2c807d4206580140ab6 100644 (file)
--- a/source/librpc/idl/efs.idl
+++ b/source/librpc/idl/efs.idl
@@ -1,4 +1,3 @@
-#include "idl_types.h"
 /*
        IDL definitions from original packet-dcerpc-efs.c
         by Jean-Baptiste Marchand

diff --git a/source/librpc/idl/idl_types.h b/source/librpc/idl/idl_types.h
index 054aef608b78bf97e6af5c0fb61a2cf00c6a1e99..f21f3e660d6178bd19759e5f38df9d06e8c06d8d 100644 (file)
--- a/source/librpc/idl/idl_types.h
+++ b/source/librpc/idl/idl_types.h
@@ -80,17 +80,7 @@
 #define NDR_LITTLE_ENDIAN LIBNDR_FLAG_LITTLE_ENDIAN
 #define NDR_BIG_ENDIAN LIBNDR_FLAG_BIGENDIAN
 
-
-/*
-  these are used by the epmapper and mgmt interfaces
-*/
-#define error_status_t uint32
-#define boolean32 uint32
-#define unsigned32 uint32
-
 /*
   this is used to control formatting of uint8 arrays
 */
 #define NDR_PAHEX LIBNDR_PRINT_ARRAY_HEX
-
-#define bool8 uint8

diff --git a/source/librpc/idl/mgmt.idl b/source/librpc/idl/mgmt.idl
index ce9b50abfaf83744eab6239518d38e46d86ee2b6..03840b48a55968e17173d9a2e510229b4c67714d 100644 (file)
--- a/source/librpc/idl/mgmt.idl
+++ b/source/librpc/idl/mgmt.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   dcerpc remote management interface
 */

diff --git a/source/librpc/idl/misc.idl b/source/librpc/idl/misc.idl
index 2f21b631051a8859238303dd0cd52a579601235d..353457dd02fc55076d3cdc816007ac3725d9ee00 100644 (file)
--- a/source/librpc/idl/misc.idl
+++ b/source/librpc/idl/misc.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   miscellaneous IDL structures
 */

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 1b03527cf7834db5eea8bcec4e356a7dcf0c1c30..c4a0f976137387f17b0d14ae9d3eeb1e849a1a84 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -353,7 +353,7 @@ interface netlogon
        } netr_USER_KEYS;
 
        typedef struct {
-               bool8  SensitiveDataFlag;
+               boolean8  SensitiveDataFlag;
                uint32 DataLength;
 
                /* netr_USER_KEYS encrypted with the session key */
@@ -380,9 +380,9 @@ interface netlogon
                samr_AcctFlags acct_flags;
                samr_Password lmpassword;
                samr_Password ntpassword;
-               bool8 nt_password_present;
-               bool8 lm_password_present;
-               bool8 password_expired;
+               boolean8 nt_password_present;
+               boolean8 lm_password_present;
+               boolean8 password_expired;
                lsa_String comment;
                lsa_String parameters;
                uint16 country_code;
@@ -498,7 +498,7 @@ interface netlogon
        typedef struct {
                uint32 maxlogsize;
                NTTIME auditretentionperiod;
-               bool8 auditingmode;
+               boolean8 auditingmode;
                uint32 maxauditeventcount;
                [size_is(maxauditeventcount+1)] uint32 *eventauditoptions;
                lsa_String primary_domain_name;

diff --git a/source/librpc/idl/opendb.idl b/source/librpc/idl/opendb.idl
index 601c143bf2e39476eaa950ab83763753f15fde88..8d1c30761c0a392da6b43879653aabb92056aac3 100644 (file)
--- a/source/librpc/idl/opendb.idl
+++ b/source/librpc/idl/opendb.idl
@@ -20,7 +20,7 @@ interface opendb
                pointer file_handle;
                /* we need a per-entry delete on close, as well as a per-file
                   one, to cope with strange semantics on open */
-               bool8 delete_on_close;
+               boolean8 delete_on_close;
                uint32 oplock_level;
        } opendb_entry;
 
@@ -30,7 +30,7 @@ interface opendb
        } opendb_pending;
 
        typedef [public] struct {
-               bool8 delete_on_close;
+               boolean8 delete_on_close;
                utf8string path;
                uint32 num_entries;
                opendb_entry entries[num_entries];

diff --git a/source/librpc/idl/oxidresolver.idl b/source/librpc/idl/oxidresolver.idl
index 6794b9cb1e04c203ee011bec5dc97c3d6527e1f1..d3f3078a0d0192d4d97b7fbac2bde7272505e403 100644 (file)
--- a/source/librpc/idl/oxidresolver.idl
+++ b/source/librpc/idl/oxidresolver.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /**
   DCOM interfaces
   http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm

diff --git a/source/librpc/idl/protected_storage.idl b/source/librpc/idl/protected_storage.idl
index 221aad65e0fa04d2bf544eb4ed24f5b030054536..7841f91ca9d49830ff507209a39e1f75c7e256e0 100644 (file)
--- a/source/librpc/idl/protected_storage.idl
+++ b/source/librpc/idl/protected_storage.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   protected_storage interface definitions
   Also seen with UUID: 

diff --git a/source/librpc/idl/remact.idl b/source/librpc/idl/remact.idl
index 0d830c3f5fd951beb3a18eb750337054c18dcfd8..a54ca7781dec136d4e577e6da9a6ee266f1ca40b 100644 (file)
--- a/source/librpc/idl/remact.idl
+++ b/source/librpc/idl/remact.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /**
   DCOM interfaces
   http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm

diff --git a/source/librpc/idl/rot.idl b/source/librpc/idl/rot.idl
index 8ae5502bdc19d296c361ce89af474a10b7554943..5851466c79ae423625a478e04513fc2ae76bc254 100644 (file)
--- a/source/librpc/idl/rot.idl
+++ b/source/librpc/idl/rot.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 [
        uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
        version(0.2),

diff --git a/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index cb57472206c4fc1a067cd1757042d58530ce1d01..c9d21dba0899cea33a127c8e131cfb0b41b3a1e2 100644 (file)
--- a/source/librpc/idl/samr.idl
+++ b/source/librpc/idl/samr.idl
@@ -817,15 +817,15 @@
        */
        NTSTATUS samr_ChangePasswordUser(
                [in,ref]    policy_handle *user_handle,
-               [in]        bool8 lm_present,
+               [in]        boolean8 lm_present,
                [in]        samr_Password *old_lm_crypted,
                [in]        samr_Password *new_lm_crypted,
-               [in]        bool8 nt_present,
+               [in]        boolean8 nt_present,
                [in]        samr_Password *old_nt_crypted,
                [in]        samr_Password *new_nt_crypted,
-               [in]        bool8 cross1_present,
+               [in]        boolean8 cross1_present,
                [in]        samr_Password *nt_cross,
-               [in]        bool8 cross2_present,
+               [in]        boolean8 cross2_present,
                [in]        samr_Password *lm_cross
                );
 
@@ -1086,7 +1086,7 @@
                [in,ref]          lsa_String *account,
                [in]              samr_CryptPassword *nt_password,
                [in]              samr_Password *nt_verifier,
-               [in]              bool8 lm_change,
+               [in]              boolean8 lm_change,
                [in]              samr_CryptPassword *lm_password,
                [in]              samr_Password *lm_verifier
                );
@@ -1171,7 +1171,7 @@
                [in,ref]          lsa_String *account,
                [in]              samr_CryptPassword *nt_password,
                [in]              samr_Password *nt_verifier,
-               [in]              bool8 lm_change,
+               [in]              boolean8 lm_change,
                [in]              samr_CryptPassword *lm_password,
                [in]              samr_Password *lm_verifier,
                [in]              samr_CryptPassword *password3,

diff --git a/source/librpc/idl/unixinfo.idl b/source/librpc/idl/unixinfo.idl
index 9d1060229f461a37c07e31ba0b4e6d49716f9935..078862f444a2e0003d173b173f917ee681268525 100644 (file)
--- a/source/librpc/idl/unixinfo.idl
+++ b/source/librpc/idl/unixinfo.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   Unixinfo interface definition
 */

diff --git a/source/librpc/idl/winreg.idl b/source/librpc/idl/winreg.idl
index 12a7877ec0c177d206bd8bb8f1940e72d1181f27..1ecb98d3b0c28d037f46f92294ee30d965de4c1d 100644 (file)
--- a/source/librpc/idl/winreg.idl
+++ b/source/librpc/idl/winreg.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   winreg interface definition
 */
@@ -95,7 +93,7 @@
        typedef struct {
                uint32 length;
                KeySecurityData sd;
-               bool8  inherit;
+               boolean8  inherit;
        } winreg_SecBuf;
 
        typedef [v1_enum] enum {

diff --git a/source/librpc/idl/wkssvc.idl b/source/librpc/idl/wkssvc.idl
index cf7e5d6996fedf08dace4b68011714ca833975b0..d658091c4769a3099ae86eab429068ec1864e041 100644 (file)
--- a/source/librpc/idl/wkssvc.idl
+++ b/source/librpc/idl/wkssvc.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
 /*
   wkssvc interface definitions
 */