First round of merging various UUID structures.

This eliminates RPC_UUID.  It creates the following struct:

struct uuid
{
  uint32 time_low;
  uint16 time_mid;
  uint16 time_hi_and_version;
  uint8  clock_seq[2];
  uint8  node[6];
};
which replaces RPC_UUID and various random struct uuid definitions


and a flat version:
#define UUID_FLAT_SIZE 16
typedef struct uuid_flat
{
	uint8 info[UUID_FLAT_SIZE];
} UUID_FLAT;

which pretty much looks like GUID (which I will start eliminating).

I want us to use the FLAT one only on the wire (perhaps in files, too?), and
I want it to be obvious to the coder that it is the FLAT version.

This leaves a couple of compiler warnings, where GUID isn't completely
replaced by FLAT_UUID yet...I'll get to those soon.
(This used to be commit 1532b5d2e3c61df232b16394acedf6eac387588b)

1 files changed, 3 insertions, 3 deletions

diff --git a/source3/rpc_parse/parse_ds.c b/source3/rpc_parse/parse_ds.c
index 26dcdb34b8..8d894b6c6a 100644
--- a/source3/rpc_parse/parse_ds.c
+++ b/source3/rpc_parse/parse_ds.c
@@ -48,8 +48,8 @@ static BOOL ds_io_dominfobasic( const char *desc, prs_struct *ps, int depth, DSR
 		return False;
 	if ( !prs_uint32("forestname_ptr", ps, depth, &p->forestname_ptr) )
 		return False;
-		
-	if ( !prs_uint8s(False, "domain_guid", ps, depth, p->domain_guid.info, GUID_SIZE) )
+
+	if ( !smb_io_uuid("domain_guid", &p->domain_guid, ps, depth) )
 		return False;
 		
 	if ( !smb_io_unistr2( "netbios_domain", &p->netbios_domain, p->netbios_ptr, ps, depth) )
@@ -179,7 +179,7 @@ static BOOL ds_io_domain_trusts( const char *desc, prs_struct *ps, int depth, DS
 	if ( !prs_uint32( "sid_ptr", ps, depth, &trust->sid_ptr ) )
 		return False;
 	
-	if ( !prs_uint8s(False, "guid", ps, depth, trust->guid.info, GUID_SIZE) )
+	if ( !smb_io_uuid("guid", &trust->guid, ps, depth) )
 		return False;
 	
 	return True;