Another round of GUID->struct uuid.

Takes care of the lsass pipe
(This used to be commit 3dca3efa4b427fa3094a8cd392fe5744b5f6f6a8)

5 files changed, 10 insertions, 10 deletions

diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 2064a38056..43ffa37d59 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -275,7 +275,7 @@ typedef struct lsa_dns_dom_info
 	UNIHDR  hdr_dns_dom_name;
 	UNIHDR  hdr_forest_name;
 
-	GUID       dom_guid; /* domain GUID */
+	struct uuid dom_guid; /* domain GUID */
 
 	UNISTR2 uni_nb_dom_name;
 	UNISTR2 uni_dns_dom_name;
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index ab4fbad613..163e847922 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -537,7 +537,8 @@ NTSTATUS cli_lsa_query_info_policy(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 NTSTATUS cli_lsa_query_info_policy2(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				    POLICY_HND *pol, uint16 info_class, 
 				    fstring domain_name, fstring dns_name,
-				    fstring forest_name, GUID *domain_guid,
+				    fstring forest_name, 
+				    struct uuid *domain_guid, 
 				    DOM_SID *domain_sid)
 {
 	prs_struct qbuf, rbuf;
@@ -599,7 +600,7 @@ NTSTATUS cli_lsa_query_info_policy2(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				 sizeof(fstring) - 1);
 	}
 	
-	memcpy(domain_guid, &r.info.dns_dom_info.dom_guid, sizeof(GUID));
+	memcpy(domain_guid, &r.info.dns_dom_info.dom_guid,sizeof(struct uuid));
 
 	if (r.info.dns_dom_info.ptr_dom_sid != 0) {
 		*domain_sid = r.info.dns_dom_info.dom_sid.sid;
diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index f960345fe7..992433f4bb 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -2142,7 +2142,7 @@ BOOL lsa_io_dns_dom_info(const char *desc, LSA_DNS_DOM_INFO *info,
 
 	if(!prs_align(ps))
 		return False;
-	if (!prs_uint8s(False, "dom_guid", ps, depth, info->dom_guid.info, GUID_SIZE))
+	if ( !smb_io_uuid("dom_guid", &info->dom_guid, ps, depth) )
 		return False;
 
 	if(!prs_align(ps))
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 0a8ad404cb..db5c8c83b0 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -348,7 +348,7 @@ static NTSTATUS lsa_get_generic_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *s
 
 static void init_dns_dom_info(LSA_DNS_DOM_INFO *r_l, const char *nb_name,
 			      const char *dns_name, const char *forest_name,
-			      GUID *dom_guid, DOM_SID *dom_sid)
+			      struct uuid *dom_guid, DOM_SID *dom_sid)
 {
 	if (nb_name && *nb_name) {
 		init_unistr2(&r_l->uni_nb_dom_name, nb_name, UNI_FLAGS_NONE);
@@ -373,7 +373,7 @@ static void init_dns_dom_info(LSA_DNS_DOM_INFO *r_l, const char *nb_name,
 
 	/* how do we init the guid ? probably should write an init fn */
 	if (dom_guid) {
-		memcpy(&r_l->dom_guid, dom_guid, sizeof(GUID));
+		memcpy(&r_l->dom_guid, dom_guid, sizeof(struct uuid));
 	}
 	
 	if (dom_sid) {
@@ -1219,7 +1219,7 @@ NTSTATUS _lsa_query_info2(pipes_struct *p, LSA_Q_QUERY_INFO2 *q_u, LSA_R_QUERY_I
 	char *dns_name = NULL;
 	char *forest_name = NULL;
 	DOM_SID *sid = NULL;
-	GUID guid;
+	struct uuid guid;
 	fstring dnsdomname;
 
 	ZERO_STRUCT(guid);
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index d4509eae44..217e6b1d68 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;
-	UUID_FLAT dom_guid;
+	struct uuid dom_guid;
 	fstring sid_str, domain_name="", dns_name="", forest_name="";
 	uint32 info_class = 3;
 
@@ -124,8 +124,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli,
 
 	if (info_class == 12) {
 		printf("domain GUID is %s\n",
-		       smb_uuid_string_static(
-			       smb_uuid_unpack_static(dom_guid)));
+		       smb_uuid_string_static(dom_guid));
 	}
  done:
 	return result;