From 4e7d11449ad419f4fa791e26e059a9f73d6d4042 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 19 Sep 2006 00:12:11 +0000 Subject: r18654: Rename "struct uuid" => "struct GUID" for consistency. (This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19) --- source3/include/rpc_dce.h | 2 +- source3/include/rpc_ds.h | 6 +++--- source3/include/rpc_lsa.h | 2 +- source3/include/rpc_netlogon.h | 6 +++--- source3/include/rpc_secdes.h | 4 ++-- source3/include/smb.h | 7 ------- 6 files changed, 10 insertions(+), 17 deletions(-) (limited to 'source3/include') diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h index b4d350ee6f..09e5f25da8 100644 --- a/source3/include/rpc_dce.h +++ b/source3/include/rpc_dce.h @@ -126,7 +126,7 @@ enum schannel_direction { /* RPC_IFACE */ typedef struct rpc_iface_info { - struct uuid uuid; /* 16 bytes of rpc interface identification */ + struct GUID uuid; /* 16 bytes of rpc interface identification */ uint32 version; /* the interface version number */ } RPC_IFACE; diff --git a/source3/include/rpc_ds.h b/source3/include/rpc_ds.h index 424e6c0494..3c64745df1 100644 --- a/source3/include/rpc_ds.h +++ b/source3/include/rpc_ds.h @@ -68,7 +68,7 @@ typedef struct uint32 dnsname_ptr; uint32 forestname_ptr; - struct uuid domain_guid; + struct GUID domain_guid; UNISTR2 netbios_domain; @@ -114,7 +114,7 @@ typedef struct { uint32 trust_type; uint32 trust_attributes; uint32 sid_ptr; - struct uuid guid; + struct GUID guid; UNISTR2 netbios_domain; UNISTR2 dns_domain; @@ -128,7 +128,7 @@ struct ds_domain_trust { uint32 parent_index; uint32 trust_type; uint32 trust_attributes; - struct uuid guid; + struct GUID guid; DOM_SID sid; char *netbios_domain; diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h index c4ce9e021d..28dea21977 100644 --- a/source3/include/rpc_lsa.h +++ b/source3/include/rpc_lsa.h @@ -174,7 +174,7 @@ typedef struct lsa_dns_dom_info UNIHDR hdr_dns_dom_name; UNIHDR hdr_forest_name; - struct uuid dom_guid; /* domain GUID */ + struct GUID dom_guid; /* domain GUID */ UNISTR2 uni_nb_dom_name; UNISTR2 uni_dns_dom_name; diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h index 6ccff623fb..0a515b74f3 100644 --- a/source3/include/rpc_netlogon.h +++ b/source3/include/rpc_netlogon.h @@ -1031,9 +1031,9 @@ typedef struct net_q_dsr_getdcname { uint32 ptr_domain_name; UNISTR2 uni_domain_name; uint32 ptr_domain_guid; - struct uuid *domain_guid; + struct GUID *domain_guid; uint32 ptr_site_guid; - struct uuid *site_guid; + struct GUID *site_guid; uint32 flags; } NET_Q_DSR_GETDCNAME; @@ -1044,7 +1044,7 @@ typedef struct net_r_dsr_getdcname { uint32 ptr_dc_address; UNISTR2 uni_dc_address; int32 dc_address_type; - struct uuid domain_guid; + struct GUID domain_guid; uint32 ptr_domain_name; UNISTR2 uni_domain_name; uint32 ptr_forest_name; diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 2ac60bd9b1..83c3b66914 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -89,8 +89,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 */ - struct uuid obj_guid; /* object GUID */ - struct uuid inh_guid; /* inherited object GUID */ + struct GUID obj_guid; /* object GUID */ + struct GUID inh_guid; /* inherited object GUID */ /* eof object stuff */ DOM_SID trustee; diff --git a/source3/include/smb.h b/source3/include/smb.h index 78ef2b693e..c8d19dacef 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1817,13 +1817,6 @@ struct ea_list { /* EA to use for DOS attributes */ #define SAMBA_XATTR_DOS_ATTRIB "user.DOSATTRIB" -struct uuid { - uint32 time_low; - uint16 time_mid; - uint16 time_hi_and_version; - uint8 clock_seq[2]; - uint8 node[6]; -}; #define UUID_SIZE 16 #define UUID_FLAT_SIZE 16 -- cgit