diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-06 18:32:20 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:43:56 -0500 |
| commit | 995205fc60f87e1a02aa1c6f309db55ae18e908a (patch) | |
| tree | bf796212b1c95b755ef07b1a91b7e26e45dbbd87 /source3/include/smb.h | |
| parent | a7be2ec7c5eb8bda76eaec0eaff7e1a7b2b39433 (diff) | |
| download | samba-995205fc60f87e1a02aa1c6f309db55ae18e908a.tar.gz samba-995205fc60f87e1a02aa1c6f309db55ae18e908a.tar.bz2 samba-995205fc60f87e1a02aa1c6f309db55ae18e908a.zip | |
r18188: merge 3.0-libndr branch
(This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675)
Diffstat (limited to 'source3/include/smb.h')
| -rw-r--r-- | source3/include/smb.h | 13 |
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; |