r18188: merge 3.0-libndr branch

(This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)

6 files changed, 37 insertions, 40 deletions

diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index f80dc3121d..6ccff623fb 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -661,8 +661,8 @@ typedef struct account_lockout_string {
 	uint32 offset;
 	uint32 length;
 /*	uint16 *bindata;	*/
-	UINT64_S lockout_duration;
-	UINT64_S reset_count;
+	uint64 lockout_duration;
+	uint64 reset_count;
 	uint32 bad_attempt_lockout;
 	uint32 dummy;
 } LOCKOUT_STRING;
@@ -679,12 +679,12 @@ typedef struct sam_domain_info_info {
 	UNIHDR hdr_dom_name;
 	UNIHDR hdr_oem_info;
 
-	UINT64_S force_logoff;
+	uint64 force_logoff;
 	uint16   min_pwd_len;
 	uint16   pwd_history_len;
-	UINT64_S max_pwd_age;
-	UINT64_S min_pwd_age;
-	UINT64_S dom_mod_count;
+	uint64 max_pwd_age;
+	uint64 min_pwd_age;
+	uint64 dom_mod_count;
 	NTTIME   creation_time;
 	uint32   security_information;
 
@@ -848,7 +848,7 @@ typedef struct sam_alias_mem_info_info {
 /* SAM_DELTA_POLICY (0x0D) */
 typedef struct {
 	uint32   max_log_size; /* 0x5000 */
-	UINT64_S audit_retention_period; /* 0 */
+	uint64 audit_retention_period; /* 0 */
 	uint32   auditing_mode; /* 0 */
 	uint32   num_events;
 	uint32   ptr_events;
@@ -860,7 +860,7 @@ typedef struct {
 	uint32   min_workset_size; /* 0x00010000 */
 	uint32   max_workset_size; /* 0x0f000000 */
 	uint32   page_file_limit; /* 0 */
-	UINT64_S time_limit; /* 0 */
+	uint64 time_limit; /* 0 */
 	NTTIME   modify_time; /* 0x3c*/
 	NTTIME   create_time; /* a7080110 */
 	BUFHDR2  hdr_sec_desc;
@@ -907,7 +907,7 @@ typedef struct {
 	uint32   min_workset_size; /* 0x00010000 */
 	uint32   max_workset_size; /* 0x0f000000 */
 	uint32   page_file_limit; /* 0 */
-	UINT64_S time_limit; /* 0 */
+	uint64 time_limit; /* 0 */
 	uint32   system_flags; /* 1 */
 	BUFHDR2  hdr_sec_desc;
 	
@@ -961,7 +961,7 @@ typedef struct {
 typedef struct {
         uint32 seqnum;
         uint32 dom_mod_count_ptr;
-	UINT64_S dom_mod_count;  /* domain mod count at last sync */
+	uint64 dom_mod_count;  /* domain mod count at last sync */
 } SAM_DELTA_MOD_COUNT;
 
 typedef union sam_delta_ctr_info {
@@ -1003,7 +1003,7 @@ typedef struct net_q_sam_deltas_info {
 	DOM_CRED ret_creds;
 
 	uint32 database_id;
-	UINT64_S dom_mod_count;  /* domain mod count at last sync */
+	uint64 dom_mod_count;  /* domain mod count at last sync */
 
 	uint32 max_size;       /* preferred maximum length */
 } NET_Q_SAM_DELTAS;
@@ -1012,7 +1012,7 @@ typedef struct net_q_sam_deltas_info {
 typedef struct net_r_sam_deltas_info {
 	DOM_CRED srv_creds;
 
-	UINT64_S dom_mod_count;   /* new domain mod count */
+	uint64 dom_mod_count;   /* new domain mod count */
 
 	uint32 ptr_deltas;
 	uint32 num_deltas;
diff --git a/source3/include/rpc_perfcount.h b/source3/include/rpc_perfcount.h
index 0e3a6eb018..dcf4e0d164 100644
--- a/source3/include/rpc_perfcount.h
+++ b/source3/include/rpc_perfcount.h
@@ -59,8 +59,8 @@ typedef struct perf_object_type
 	uint32 DefaultCounter;
 	uint32 NumInstances;
 	uint32 CodePage;
-	UINT64_S PerfTime;
-	UINT64_S PerfFreq;
+	uint64 PerfTime;
+	uint64 PerfFreq;
 	PERF_COUNTER_DEFINITION *counters;
 	PERF_INSTANCE_DEFINITION *instances;
 	PERF_COUNTER_BLOCK counter_data;
@@ -88,13 +88,13 @@ typedef struct perf_data_block
 	   PerfTime, and having it there will make my offset math much easier. */
 	uint32 Padding;
 	/* Now when I'm marshalling this, I'll need to call prs_align_uint64() 
-	   before I start encodint the UINT64_S structs */
+	   before I start encodint the uint64 structs */
 	/* clock rate * seconds uptime */
-	UINT64_S PerfTime;
+	uint64 PerfTime;
 	/* The clock rate of the CPU */
-	UINT64_S PerfFreq; 
+	uint64 PerfFreq; 
 	/* used for high-res timers -- for now PerfTime * 10e7 */
-	UINT64_S PerfTime100nSec;
+	uint64 PerfTime100nSec;
 	uint32 SystemNameLength;
 	uint32 SystemNameOffset;
 	/* The SystemName, in unicode, terminated */
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index ed4e51837f..fc861b9e7a 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -553,7 +553,7 @@ typedef struct sam_unknown_info_2_inf
 	   pointer is referring to
 	 */
 
-	UINT64_S seq_num;
+	uint64 seq_num;
 	
 	uint32 unknown_4; /* 0x0000 0001 */
 	uint32 server_role;
@@ -605,7 +605,7 @@ typedef struct sam_unknown_info_7_info
 
 typedef struct sam_unknown_info_8_info
 {
-	UINT64_S seq_num;
+	uint64 seq_num;
 	NTTIME domain_create_time;
 
 } SAM_UNK_INFO_8;
@@ -626,7 +626,7 @@ typedef struct sam_unknown_info_12_inf
 
 typedef struct sam_unknown_info_13_info
 {
-	UINT64_S seq_num;
+	uint64 seq_num;
 	NTTIME domain_create_time;
 	uint32 unknown1;
 	uint32 unknown2;
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 681dcd73d4..ecc50bd8aa 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -1556,7 +1556,7 @@ typedef struct {
 	uint32 previousnames_len;
 	uint32 previousnames_ptr;
 	NTTIME	driverdate;
-	UINT64_S	driverversion;
+	uint64	driverversion;
 	uint32	dummy4;
 	uint32 mfgname_ptr;
 	uint32 oemurl_ptr;
diff --git a/source3/include/rpc_unixinfo.h b/source3/include/rpc_unixinfo.h
index f2f4382fc4..913196b7c9 100644
--- a/source3/include/rpc_unixinfo.h
+++ b/source3/include/rpc_unixinfo.h
@@ -34,12 +34,12 @@ typedef struct unixinfo_q_sid_to_uid {
 } UNIXINFO_Q_SID_TO_UID;
 
 typedef struct unixinfo_r_sid_to_uid {
-	UINT64_S uid;
+	uint64 uid;
 	NTSTATUS status;
 } UNIXINFO_R_SID_TO_UID;
 
 typedef struct unixinfo_q_uid_to_sid {
-	UINT64_S uid;
+	uint64 uid;
 } UNIXINFO_Q_UID_TO_SID;
 
 typedef struct unixinfo_r_uid_to_sid {
@@ -53,12 +53,12 @@ typedef struct unixinfo_q_sid_to_gid {
 } UNIXINFO_Q_SID_TO_GID;
 
 typedef struct unixinfo_r_sid_to_gid {
-	UINT64_S gid;
+	uint64 gid;
 	NTSTATUS status;
 } UNIXINFO_R_SID_TO_GID;
 
 typedef struct unixinfo_q_gid_to_sid {
-	UINT64_S gid;
+	uint64 gid;
 } UNIXINFO_Q_GID_TO_SID;
 
 typedef struct unixinfo_r_gid_to_sid {
@@ -69,7 +69,7 @@ typedef struct unixinfo_r_gid_to_sid {
 
 typedef struct unixinfo_q_getpwuid {
 	uint32 count;
-	UINT64_S *uid;
+	uint64 *uid;
 } UNIXINFO_Q_GETPWUID;
 
 struct unixinfo_getpwuid {
@@ -123,12 +123,12 @@ typedef struct unixinfo_q_sid_to_uid {
 } UNIXINFO_Q_SID_TO_UID;
 
 typedef struct unixinfo_r_sid_to_uid {
-	UINT64_S uid;
+	uint64 uid;
 	NTSTATUS status;
 } UNIXINFO_R_SID_TO_UID;
 
 typedef struct unixinfo_q_uid_to_sid {
-	UINT64_S uid;
+	uint64 uid;
 } UNIXINFO_Q_UID_TO_SID;
 
 typedef struct unixinfo_r_uid_to_sid {
@@ -142,12 +142,12 @@ typedef struct unixinfo_q_sid_to_gid {
 } UNIXINFO_Q_SID_TO_GID;
 
 typedef struct unixinfo_r_sid_to_gid {
-	UINT64_S gid;
+	uint64 gid;
 	NTSTATUS status;
 } UNIXINFO_R_SID_TO_GID;
 
 typedef struct unixinfo_q_gid_to_sid {
-	UINT64_S gid;
+	uint64 gid;
 } UNIXINFO_Q_GID_TO_SID;
 
 typedef struct unixinfo_r_gid_to_sid {
@@ -157,7 +157,7 @@ typedef struct unixinfo_r_gid_to_sid {
 } UNIXINFO_R_GID_TO_SID;
 
 typedef struct unixinfo_q_getpwuid {
-	UINT64_S uid;
+	uint64 uid;
 } UNIXINFO_Q_GETPWUID;
 
 typedef struct unixinfo_r_getpwuid {
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 6f1e51b1a6..741b4a9d53 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -213,14 +213,8 @@ typedef smb_ucs2_t wfstring[FSTRING_LEN];
 #define PI_NTSVCS		14
 #define PI_MAX_PIPES		15
 
-typedef struct uint64_s
-{
-	uint32 low;
-	uint32 high;
-} UINT64_S;
-
 /* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
-typedef UINT64_S NTTIME;
+typedef uint64_t NTTIME;
 
 
 /* Allowable account control bits */
@@ -280,7 +274,7 @@ enum SID_NAME_USE {
  *
  * @sa http://msdn.microsoft.com/library/default.asp?url=/library/en-us/security/accctrl_38yn.asp
  **/
-typedef struct sid_info {
+typedef struct dom_sid {
 	uint8  sid_rev_num;             /**< SID revision number */
 	uint8  num_auths;               /**< Number of sub-authorities */
 	uint8  id_auth[6];              /**< Identifier Authority */
@@ -293,6 +287,9 @@ typedef struct sid_info {
 	uint32 sub_auths[MAXSUBAUTHS];  
 } DOM_SID;
 
+#include "libndr/misc.h"
+#include "libndr/security.h"
+
 struct lsa_dom_info {
 	BOOL valid;
 	DOM_SID sid;