summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-16 23:51:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:03 -0500
commitd86da81304bc247c77b78f1f1d9da562168285d7 (patch)
tree8430892de89518715b7c022aa832c48060d103c2
parentfda645af50ea82c74d51ef76b37a6b38a826c56c (diff)
downloadsamba-d86da81304bc247c77b78f1f1d9da562168285d7.tar.gz
samba-d86da81304bc247c77b78f1f1d9da562168285d7.tar.bz2
samba-d86da81304bc247c77b78f1f1d9da562168285d7.zip
r15653: Remove idl_types.h include where possible. Remove
types from .h file that are now in pidls' aliases list. (This used to be commit fadb9529ec7e1208b9f58a4e8b633d5a50633e82)
-rw-r--r--source4/librpc/idl/atsvc.idl2
-rw-r--r--source4/librpc/idl/dcom.idl2
-rw-r--r--source4/librpc/idl/dfs.idl2
-rw-r--r--source4/librpc/idl/dnsserver.idl2
-rw-r--r--source4/librpc/idl/dssetup.idl2
-rw-r--r--source4/librpc/idl/echo.idl2
-rw-r--r--source4/librpc/idl/efs.idl1
-rw-r--r--source4/librpc/idl/idl_types.h10
-rw-r--r--source4/librpc/idl/mgmt.idl2
-rw-r--r--source4/librpc/idl/misc.idl2
-rw-r--r--source4/librpc/idl/netlogon.idl10
-rw-r--r--source4/librpc/idl/opendb.idl4
-rw-r--r--source4/librpc/idl/oxidresolver.idl2
-rw-r--r--source4/librpc/idl/protected_storage.idl2
-rw-r--r--source4/librpc/idl/remact.idl2
-rw-r--r--source4/librpc/idl/rot.idl2
-rw-r--r--source4/librpc/idl/samr.idl12
-rw-r--r--source4/librpc/idl/unixinfo.idl2
-rw-r--r--source4/librpc/idl/winreg.idl4
-rw-r--r--source4/librpc/idl/wkssvc.idl2
20 files changed, 14 insertions, 55 deletions
diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
index e1eb46e7e0..d58a719651 100644
--- a/source4/librpc/idl/atsvc.idl
+++ b/source4/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/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 7b40461c16..ce10c98c0a 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/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/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index 288dd39f2e..ef3d2ca604 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/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/source4/librpc/idl/dnsserver.idl b/source4/librpc/idl/dnsserver.idl
index dca86d5820..86a8a14f13 100644
--- a/source4/librpc/idl/dnsserver.idl
+++ b/source4/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/source4/librpc/idl/dssetup.idl b/source4/librpc/idl/dssetup.idl
index 818460fbba..9c490aebe3 100644
--- a/source4/librpc/idl/dssetup.idl
+++ b/source4/librpc/idl/dssetup.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
/*
dssetup interface definition
*/
diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
index 4fe3d872e3..7b80e3e296 100644
--- a/source4/librpc/idl/echo.idl
+++ b/source4/librpc/idl/echo.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
[
uuid("60a15ec5-4de8-11d7-a637-005056a20182"),
diff --git a/source4/librpc/idl/efs.idl b/source4/librpc/idl/efs.idl
index c58b72a401..75d997a018 100644
--- a/source4/librpc/idl/efs.idl
+++ b/source4/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/source4/librpc/idl/idl_types.h b/source4/librpc/idl/idl_types.h
index 054aef608b..f21f3e660d 100644
--- a/source4/librpc/idl/idl_types.h
+++ b/source4/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/source4/librpc/idl/mgmt.idl b/source4/librpc/idl/mgmt.idl
index ce9b50abfa..03840b48a5 100644
--- a/source4/librpc/idl/mgmt.idl
+++ b/source4/librpc/idl/mgmt.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
/*
dcerpc remote management interface
*/
diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 2f21b63105..353457dd02 100644
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
/*
miscellaneous IDL structures
*/
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 1b03527cf7..c4a0f97613 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/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/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl
index 601c143bf2..8d1c30761c 100644
--- a/source4/librpc/idl/opendb.idl
+++ b/source4/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/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index 6794b9cb1e..d3f3078a0d 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/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/source4/librpc/idl/protected_storage.idl b/source4/librpc/idl/protected_storage.idl
index 221aad65e0..7841f91ca9 100644
--- a/source4/librpc/idl/protected_storage.idl
+++ b/source4/librpc/idl/protected_storage.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
/*
protected_storage interface definitions
Also seen with UUID:
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index 0d830c3f5f..a54ca7781d 100644
--- a/source4/librpc/idl/remact.idl
+++ b/source4/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/source4/librpc/idl/rot.idl b/source4/librpc/idl/rot.idl
index 8ae5502bdc..5851466c79 100644
--- a/source4/librpc/idl/rot.idl
+++ b/source4/librpc/idl/rot.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
[
uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
version(0.2),
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index cb57472206..c9d21dba08 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/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/source4/librpc/idl/unixinfo.idl b/source4/librpc/idl/unixinfo.idl
index 9d1060229f..078862f444 100644
--- a/source4/librpc/idl/unixinfo.idl
+++ b/source4/librpc/idl/unixinfo.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
/*
Unixinfo interface definition
*/
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 12a7877ec0..1ecb98d3b0 100644
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/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/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index cf7e5d6996..d658091c47 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -1,5 +1,3 @@
-#include "idl_types.h"
-
/*
wkssvc interface definitions
*/