summaryrefslogtreecommitdiff
path: root/source3/include/smb.h
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include/smb.h')
-rw-r--r--source3/include/smb.h13
1 files changed, 5 insertions, 8 deletions
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;