diff options
author | Gerald Carter <jerry@samba.org> | 2004-04-13 14:39:48 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:13 -0500 |
commit | 8ad3d8c9b065f3a2040beff801bdc9dceac868a8 (patch) | |
tree | 8c0763ba095ca5386b5b06ddb3f10a05d9a85dcf /source3/include/rpc_secdes.h | |
parent | 142f5604b56240054f088dce4703c714b7065106 (diff) | |
download | samba-8ad3d8c9b065f3a2040beff801bdc9dceac868a8.tar.gz samba-8ad3d8c9b065f3a2040beff801bdc9dceac868a8.tar.bz2 samba-8ad3d8c9b065f3a2040beff801bdc9dceac868a8.zip |
r196: merging struct uuid from trunk
(This used to be commit 911a28361b9d8dd50597627f245ebfb57c6294fb)
Diffstat (limited to 'source3/include/rpc_secdes.h')
-rw-r--r-- | source3/include/rpc_secdes.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 5e718f8167..56145ac024 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -113,13 +113,6 @@ PROTECTED_SACL_SECURITY_INFORMATION|\ PROTECTED_DACL_SECURITY_INFORMATION) -/* Globally Unique ID */ -#define GUID_SIZE 16 -typedef struct guid_info -{ - uint8 info[GUID_SIZE]; -} GUID; - /* SEC_ACCESS */ typedef struct security_info_info { @@ -138,8 +131,8 @@ typedef struct security_ace_info /* this stuff may be present when type is XXXX_TYPE_XXXX_OBJECT */ uint32 obj_flags; /* xxxx_ACE_OBJECT_xxxx e.g present/inherited present etc */ - GUID obj_guid; /* object GUID */ - GUID inh_guid; /* inherited object GUID */ + struct uuid obj_guid; /* object GUID */ + struct uuid inh_guid; /* inherited object GUID */ /* eof object stuff */ DOM_SID trustee; |