r5034: - added a type mapping function in pidl, so the type names in our IDL

  files don't need to match the type names in the generated headers

- with this type mapping we no longer need definitions for the
  deprecated "int32", "uint8" etc form of types. We can now force
  everyone to use the standard types int32_t, uint8_t etc.

- fixed all the code that used the deprecated types

- converted the IDL types "int64" and "uint64" to "dlong" and
  "udlong". These are the 4 byte aligned 64 bit integers that
  Microsoft internally define as two 32 bit integers in a
  structure. After discussions with Ronnie Sahlberg we decided that
  calling these "int64" was confusing, as it implied a true 8 byte
  aligned type

- fixed all the cases where we incorrectly used things like
  "NTTIME_hyper" in our C code. The generated API now uses a NTTIME for
  those. The fact that it is hyper-aligned on the wire is not relevant
  to the API, and should remain just a IDL property
(This used to be commit f86521677d7ff16bdc4815f9524e5286026f10f3)

3 files changed, 17 insertions, 17 deletions

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 3d3005685b..cb537d75a3 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -76,8 +76,8 @@ interface netlogon
 	/* in netr_AcctLockStr size seems to be be 24, and rrenard thinks 
 	   that the structure of the bindata looks like this:
 
-		uint64 lockout_duration;
-		uint64 reset_count;
+		dlong  lockout_duration;
+		udlong reset_count;
 		uint32 bad_attempt_lockout;
 		uint32 dummy;	
 
@@ -407,9 +407,9 @@ interface netlogon
 		uint16 min_password_length;
 		uint16 password_history_length;
 		/* yes, these are signed. They are in negative 100ns */
-		int64  max_password_age;
-		int64  min_password_age;
-		uint64 sequence_num;
+		dlong  max_password_age;
+		dlong  min_password_age;
+		udlong sequence_num;
 		NTTIME domain_create_time;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
@@ -504,7 +504,7 @@ interface netlogon
 		netr_String primary_domain_name;
 		dom_sid2 *sid;
 		netr_QUOTA_LIMITS quota_limits;
-		uint64 sequence_num;
+		udlong sequence_num;
 		NTTIME db_create_time;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
@@ -635,7 +635,7 @@ interface netlogon
 		[case(NETR_DELTA_DELETE_SECRET)]   netr_DELTA_DELETE_SECRET    delete_secret;
 		[case(NETR_DELTA_DELETE_GROUP2)]   netr_DELTA_DELETE_USER     *delete_group;
 		[case(NETR_DELTA_DELETE_USER2)]    netr_DELTA_DELETE_USER     *delete_user;
-		[case(NETR_DELTA_MODIFY_COUNT)]    uint64                     *modified_count;
+		[case(NETR_DELTA_MODIFY_COUNT)]    udlong                     *modified_count;
 	} netr_DELTA_UNION;
 
 	typedef union {
@@ -681,7 +681,7 @@ interface netlogon
 		[in]      netr_Authenticator credential,
 		[in,out]  netr_Authenticator return_authenticator,
 		[in]      netr_SamDatabaseID database_id,
-		[in,out]  uint64 sequence_num,
+		[in,out]  udlong sequence_num,
 		[in]      uint32 preferredmaximumlength,
 		[out]     netr_DELTA_ENUM_ARRAY *delta_enum_array
 		);
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index fd6229bf63..db7f4aa6cc 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -135,8 +135,8 @@
 		uint16 password_history_length;
 		uint32 password_properties;
 		/* yes, these are signed. They are in negative 100ns */
-		int64  max_password_age;
-		int64  min_password_age;
+		dlong  max_password_age;
+		dlong  min_password_age;
 	} samr_DomInfo1;
 
 	typedef struct {
@@ -144,7 +144,7 @@
 		samr_String comment;
 		samr_String domain;  /* domain name */
 		samr_String primary; /* PDC name if this is a BDC */
-		uint64 sequence_num;
+		udlong sequence_num;
 		uint32 unknown2;
 		samr_Role role;
 		uint32 unknown3;
diff --git a/source4/librpc/idl/xattr.idl b/source4/librpc/idl/xattr.idl
index 501ac2ab7d..afcefe49bc 100644
--- a/source4/librpc/idl/xattr.idl
+++ b/source4/librpc/idl/xattr.idl
@@ -23,8 +23,8 @@ interface xattr
 	typedef struct {
 		uint32 attrib;
 		uint32 ea_size;
-		uint64 size;
-		uint64 alloc_size;
+		udlong size;
+		udlong alloc_size;
 		NTTIME create_time;
 		NTTIME change_time;
 	} xattr_DosInfo1;
@@ -35,8 +35,8 @@ interface xattr
 		uint32     flags;
 		uint32     attrib;
 		uint32     ea_size;
-		uint64     size;
-		uint64     alloc_size;
+		udlong     size;
+		udlong     alloc_size;
 		NTTIME     create_time;
 		NTTIME     change_time;
 		NTTIME     write_time; /* only used when sticky write time is set */
@@ -82,8 +82,8 @@ interface xattr
 
 	typedef struct {
 		uint32     flags;
-		uint64     size;
-		uint64     alloc_size;
+		udlong     size;
+		udlong     alloc_size;
 		utf8string name;
 	} xattr_DosStream;