diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-19 00:12:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:52:19 -0500 |
| commit | 4e7d11449ad419f4fa791e26e059a9f73d6d4042 (patch) | |
| tree | a826e6e5634ae9c3174c5ae3620adfe6dfb03749 /source3/rpc_parse | |
| parent | bc82f70e0b66c55ca90c7dec490de478812151c2 (diff) | |
| download | samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.tar.gz samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.tar.xz samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.zip | |
r18654: Rename "struct uuid" => "struct GUID" for consistency.
(This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
Diffstat (limited to 'source3/rpc_parse')
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 6 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_net.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c index cd2aabd0566..401251286c9 100644 --- a/source3/rpc_parse/parse_misc.c +++ b/source3/rpc_parse/parse_misc.c @@ -298,10 +298,10 @@ BOOL smb_io_dom_sid2(const char *desc, DOM_SID2 *sid, prs_struct *ps, int depth) } /******************************************************************* - Reads or writes a struct uuid + Reads or writes a struct GUID ********************************************************************/ -BOOL smb_io_uuid(const char *desc, struct uuid *uuid, +BOOL smb_io_uuid(const char *desc, struct GUID *uuid, prs_struct *ps, int depth) { if (uuid == NULL) @@ -1704,7 +1704,7 @@ BOOL smb_io_pol_hnd(const char *desc, POLICY_HND *pol, prs_struct *ps, int depth if (!prs_uint32("handle_type", ps, depth, &pol->handle_type)) return False; - if (!smb_io_uuid("uuid", (struct uuid*)&pol->uuid, ps, depth)) + if (!smb_io_uuid("uuid", (struct GUID*)&pol->uuid, ps, depth)) return False; return True; diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c index 5fbf9874a05..ac8921987a7 100644 --- a/source3/rpc_parse/parse_net.c +++ b/source3/rpc_parse/parse_net.c @@ -3232,8 +3232,8 @@ BOOL net_io_r_sam_deltas(const char *desc, void init_net_q_dsr_getdcname(NET_Q_DSR_GETDCNAME *r_t, const char *server_unc, const char *domain_name, - struct uuid *domain_guid, - struct uuid *site_guid, + struct GUID *domain_guid, + struct GUID *site_guid, uint32_t flags) { DEBUG(5, ("init_net_q_dsr_getdcname\n")); @@ -3290,7 +3290,7 @@ BOOL net_io_q_dsr_getdcname(const char *desc, NET_Q_DSR_GETDCNAME *r_t, return False; if (UNMARSHALLING(ps) && (r_t->ptr_domain_guid)) { - r_t->domain_guid = PRS_ALLOC_MEM(ps, struct uuid, 1); + r_t->domain_guid = PRS_ALLOC_MEM(ps, struct GUID, 1); if (r_t->domain_guid == NULL) return False; } @@ -3306,7 +3306,7 @@ BOOL net_io_q_dsr_getdcname(const char *desc, NET_Q_DSR_GETDCNAME *r_t, return False; if (UNMARSHALLING(ps) && (r_t->ptr_site_guid)) { - r_t->site_guid = PRS_ALLOC_MEM(ps, struct uuid, 1); + r_t->site_guid = PRS_ALLOC_MEM(ps, struct GUID, 1); if (r_t->site_guid == NULL) return False; } @@ -3329,7 +3329,7 @@ BOOL net_io_q_dsr_getdcname(const char *desc, NET_Q_DSR_GETDCNAME *r_t, ********************************************************************/ void init_net_r_dsr_getdcname(NET_R_DSR_GETDCNAME *r_t, const char *dc_unc, const char *dc_address, int32 dc_address_type, - struct uuid domain_guid, const char *domain_name, + struct GUID domain_guid, const char *domain_name, const char *forest_name, uint32 dc_flags, const char *dc_site_name, const char *client_site_name) |