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/rpc_client/cli_lsarpc.c | 6 +++--- source3/rpc_client/cli_netlogon.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/rpc_client') diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index 60ebb88e11..2e0e8e36ad 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/source3/rpc_client/cli_lsarpc.c @@ -515,7 +515,7 @@ NTSTATUS rpccli_lsa_query_info_policy2(struct rpc_pipe_client *cli, POLICY_HND *pol, uint16 info_class, char **domain_name, char **dns_name, char **forest_name, - struct uuid **domain_guid, + struct GUID **domain_guid, DOM_SID **domain_sid) { prs_struct qbuf, rbuf; @@ -574,13 +574,13 @@ NTSTATUS rpccli_lsa_query_info_policy2(struct rpc_pipe_client *cli, } if (domain_guid) { - *domain_guid = TALLOC_P(mem_ctx, struct uuid); + *domain_guid = TALLOC_P(mem_ctx, struct GUID); if (!*domain_guid) { return NT_STATUS_NO_MEMORY; } memcpy(*domain_guid, &r.ctr.info.id12.dom_guid, - sizeof(struct uuid)); + sizeof(struct GUID)); } if (domain_sid && r.ctr.info.id12.ptr_dom_sid != 0) { diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 85e56465b4..faecf9f3fe 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -424,12 +424,12 @@ WERROR rpccli_netlogon_dsr_getdcname(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, const char *domain_name, - struct uuid *domain_guid, - struct uuid *site_guid, + struct GUID *domain_guid, + struct GUID *site_guid, uint32_t flags, char **dc_unc, char **dc_address, int32 *dc_address_type, - struct uuid *domain_guid_out, + struct GUID *domain_guid_out, char **domain_name_out, char **forest_name, uint32 *dc_flags, -- cgit