From 523444b7b69fd14798a70cbf98b4f5f0177bfd2a Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 30 Oct 2003 16:38:39 +0000 Subject: 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) --- source3/rpcclient/cmd_epmapper.c | 18 ++++++++++-------- source3/rpcclient/cmd_lsarpc.c | 7 ++++--- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_epmapper.c b/source3/rpcclient/cmd_epmapper.c index e2eecb6f04..4998286194 100644 --- a/source3/rpcclient/cmd_epmapper.c +++ b/source3/rpcclient/cmd_epmapper.c @@ -34,19 +34,21 @@ static NTSTATUS cmd_epm_map(struct cli_state *cli, uint32 numtowers; /* need to allow all this stuff to be passed in, but for now, it demonstrates the call */ - RPC_UUID if_uuid = {0xe3514235, 0x4b06, 0x11d1, \ - { 0xab, 0x04, 0x00, 0xc0, \ - 0x4f, 0xc2, 0xdc, 0xd2 }}, - syn_uuid = {0x8a885d04, 0x1ceb, 0x11c9, \ - { 0x9f, 0xe8, 0x08, 0x00, \ - 0x2b, 0x10, 0x48, 0x60 }}; + struct uuid if_uuid = {0xe3514235, 0x4b06, 0x11d1, \ + { 0xab, 0x04 }, \ + { 0x00, 0xc0, \ + 0x4f, 0xc2, 0xdc, 0xd2 } }, + syn_uuid = {0x8a885d04, 0x1ceb, 0x11c9, \ + { 0x9f, 0xe8 }, \ + { 0x08, 0x00, \ + 0x2b, 0x10, 0x48, 0x60 } }; NTSTATUS result; ZERO_STRUCT(handle); numtowers = 1; - init_epm_floor_uuid(&floors[0], &if_uuid, 4); - init_epm_floor_uuid(&floors[1], &syn_uuid, 2); + init_epm_floor_uuid(&floors[0], if_uuid, 4); + init_epm_floor_uuid(&floors[1], syn_uuid, 2); init_epm_floor_rpc(&floors[2]); /* sample for netbios named pipe query diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c index db74370bc0..d4509eae44 100644 --- a/source3/rpcclient/cmd_lsarpc.c +++ b/source3/rpcclient/cmd_lsarpc.c @@ -69,7 +69,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli, POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; DOM_SID dom_sid; - GUID dom_guid; + UUID_FLAT dom_guid; fstring sid_str, domain_name="", dns_name="", forest_name=""; uint32 info_class = 3; @@ -123,8 +123,9 @@ static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli, printf("forest name is %s\n", forest_name); if (info_class == 12) { - printf("domain GUID is "); - print_guid(&dom_guid); + printf("domain GUID is %s\n", + smb_uuid_string_static( + smb_uuid_unpack_static(dom_guid))); } done: return result; -- cgit