3 files changed, 18 insertions, 19 deletions

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index fca8fe876e..551803fa8e 100644
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -65,12 +65,6 @@ interface misc
 		GUID   uuid;
 	} policy_handle;
 
-	/* a 4 byte aligned 64-bit integer */
-	typedef [public] struct {
-		uint32 low;
-		uint32 high;
-	} ULONG8;
-
 	/* this is also used in samr and netlogon */
 	typedef [public, flag(NDR_PAHEX)] struct {
 		uint16 units_per_week;
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 693e7bf57c..f3c2b1ff26 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -77,8 +77,8 @@ interface netlogon
 	/* in netr_AcctLockStr size seems to be be 24, and rrenard thinks 
 	   that the structure of the bindata looks like this:
 
-		ULONG8 lockout_duration;
-		ULONG8 reset_count;
+		uint64 lockout_duration;
+		uint64 reset_count;
 		uint32 bad_attempt_lockout;
 		uint32 dummy;	
 
@@ -371,9 +371,9 @@ interface netlogon
 		NTTIME forcedlogoff;
 		uint16 minpasswdlen;
 		uint16 passwdhistorylen;
-		ULONG8 pwd_must_change_time;
-		ULONG8 pwd_can_change_time;
-		ULONG8 sequence_num;
+		uint64 pwd_must_change_time;
+		uint64 pwd_can_change_time;
+		uint64 sequence_num;
 		NTTIME domain_create_time;
 		uint32 SecurityInformation;
 		sec_desc_buf sdbuf;
@@ -597,7 +597,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)]    ULONG8                     *modified_count;
+		[case(NETR_DELTA_MODIFY_COUNT)]    uint64                     *modified_count;
 	} netr_DELTA_UNION;
 
 	typedef union {
@@ -643,7 +643,7 @@ interface netlogon
 		[in]      netr_Authenticator credential,
 		[in,out]  netr_Authenticator return_authenticator,
 		[in]      uint32 database_id,
-		[in,out]  ULONG8 sequence_num,
+		[in,out]  uint64 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 2ff4e86cd1..3c9005a1f3 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -129,12 +129,13 @@
 		uint16 min_pwd_len;
 		uint16 password_history;
 		uint32 password_properties;
-		ULONG8 max_password_age;
-		ULONG8 min_password_age;
+		/* yes, these are signed. They are in negative 100ns */
+		int64  max_password_age;
+		int64  min_password_age;
 	} samr_DomInfo1;
 
 	typedef struct {
-		ULONG8 force_logoff_time;
+		uint64 force_logoff_time;
 		samr_Name comment;
 		samr_Name domain;  /* domain name */
 		samr_Name primary; /* PDC name if this is a BDC */
@@ -148,7 +149,7 @@
 	} samr_DomInfo2;
 
 	typedef struct {
-		ULONG8 force_logoff_time;
+		uint64 force_logoff_time;
 	} samr_DomInfo3;
 
 	typedef struct {
@@ -180,7 +181,7 @@
 	} samr_DomInfo9;
 
 	typedef struct {
-		ULONG8 force_logoff_time;
+		uint64 force_logoff_time;
 		samr_Name comment;
 		samr_Name domain;
 		samr_Name primary;
@@ -1162,10 +1163,14 @@
 	/************************/
 	/* Function    0x3f     */
 
+	const int SAMR_REJECT_OTHER      = 0;
+	const int SAMR_REJECT_TOO_SHORT  = 1;
+	const int SAMR_REJECT_COMPLEXITY = 2;
+
 	typedef struct {
+		uint32 reason;
 		uint32 unknown1;
 		uint32 unknown2;
-		uint32 unknown3;
 	} samr_ChangeReject;
 
 	NTSTATUS samr_ChangePasswordUser3(