summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source3/include/rpc_dce.h2
-rw-r--r--source3/include/rpc_ds.h6
-rw-r--r--source3/include/rpc_lsa.h2
-rw-r--r--source3/include/rpc_netlogon.h6
-rw-r--r--source3/include/rpc_secdes.h4
-rw-r--r--source3/include/smb.h7
-rw-r--r--source3/lib/secace.c4
-rw-r--r--source3/lib/util_uuid.c16
-rw-r--r--source3/libmsrpc/cac_lsarpc.c2
-rw-r--r--source3/passdb/secrets.c16
-rw-r--r--source3/printing/nt_printing.c14
-rw-r--r--source3/rpc_client/cli_lsarpc.c6
-rw-r--r--source3/rpc_client/cli_netlogon.c6
-rw-r--r--source3/rpc_parse/parse_misc.c6
-rw-r--r--source3/rpc_parse/parse_net.c10
-rw-r--r--source3/rpc_server/srv_pipe.c4
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c2
17 files changed, 53 insertions, 60 deletions
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index b4d350ee6f..09e5f25da8 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -126,7 +126,7 @@ enum schannel_direction {
/* RPC_IFACE */
typedef struct rpc_iface_info {
- struct uuid uuid; /* 16 bytes of rpc interface identification */
+ struct GUID uuid; /* 16 bytes of rpc interface identification */
uint32 version; /* the interface version number */
} RPC_IFACE;
diff --git a/source3/include/rpc_ds.h b/source3/include/rpc_ds.h
index 424e6c0494..3c64745df1 100644
--- a/source3/include/rpc_ds.h
+++ b/source3/include/rpc_ds.h
@@ -68,7 +68,7 @@ typedef struct
uint32 dnsname_ptr;
uint32 forestname_ptr;
- struct uuid domain_guid;
+ struct GUID domain_guid;
UNISTR2 netbios_domain;
@@ -114,7 +114,7 @@ typedef struct {
uint32 trust_type;
uint32 trust_attributes;
uint32 sid_ptr;
- struct uuid guid;
+ struct GUID guid;
UNISTR2 netbios_domain;
UNISTR2 dns_domain;
@@ -128,7 +128,7 @@ struct ds_domain_trust {
uint32 parent_index;
uint32 trust_type;
uint32 trust_attributes;
- struct uuid guid;
+ struct GUID guid;
DOM_SID sid;
char *netbios_domain;
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index c4ce9e021d..28dea21977 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -174,7 +174,7 @@ typedef struct lsa_dns_dom_info
UNIHDR hdr_dns_dom_name;
UNIHDR hdr_forest_name;
- struct uuid dom_guid; /* domain GUID */
+ struct GUID dom_guid; /* domain GUID */
UNISTR2 uni_nb_dom_name;
UNISTR2 uni_dns_dom_name;
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 6ccff623fb..0a515b74f3 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -1031,9 +1031,9 @@ typedef struct net_q_dsr_getdcname {
uint32 ptr_domain_name;
UNISTR2 uni_domain_name;
uint32 ptr_domain_guid;
- struct uuid *domain_guid;
+ struct GUID *domain_guid;
uint32 ptr_site_guid;
- struct uuid *site_guid;
+ struct GUID *site_guid;
uint32 flags;
} NET_Q_DSR_GETDCNAME;
@@ -1044,7 +1044,7 @@ typedef struct net_r_dsr_getdcname {
uint32 ptr_dc_address;
UNISTR2 uni_dc_address;
int32 dc_address_type;
- struct uuid domain_guid;
+ struct GUID domain_guid;
uint32 ptr_domain_name;
UNISTR2 uni_domain_name;
uint32 ptr_forest_name;
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 2ac60bd9b1..83c3b66914 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -89,8 +89,8 @@ typedef struct security_ace_info
/* this stuff may be present when type is XXXX_TYPE_XXXX_OBJECT */
uint32 obj_flags; /* xxxx_ACE_OBJECT_xxxx e.g present/inherited present etc */
- struct uuid obj_guid; /* object GUID */
- struct uuid inh_guid; /* inherited object GUID */
+ struct GUID obj_guid; /* object GUID */
+ struct GUID inh_guid; /* inherited object GUID */
/* eof object stuff */
DOM_SID trustee;
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 78ef2b693e..c8d19dacef 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1817,13 +1817,6 @@ struct ea_list {
/* EA to use for DOS attributes */
#define SAMBA_XATTR_DOS_ATTRIB "user.DOSATTRIB"
-struct uuid {
- uint32 time_low;
- uint16 time_mid;
- uint16 time_hi_and_version;
- uint8 clock_seq[2];
- uint8 node[6];
-};
#define UUID_SIZE 16
#define UUID_FLAT_SIZE 16
diff --git a/source3/lib/secace.c b/source3/lib/secace.c
index f1d4d99cc1..eb2fdd5c2b 100644
--- a/source3/lib/secace.c
+++ b/source3/lib/secace.c
@@ -48,8 +48,8 @@ void sec_ace_copy(SEC_ACE *ace_dest, SEC_ACE *ace_src)
ace_dest->size = ace_src->size;
ace_dest->info.mask = ace_src->info.mask;
ace_dest->obj_flags = ace_src->obj_flags;
- memcpy(&ace_dest->obj_guid, &ace_src->obj_guid, sizeof(struct uuid));
- memcpy(&ace_dest->inh_guid, &ace_src->inh_guid, sizeof(struct uuid));
+ memcpy(&ace_dest->obj_guid, &ace_src->obj_guid, sizeof(struct GUID));
+ memcpy(&ace_dest->inh_guid, &ace_src->inh_guid, sizeof(struct GUID));
sid_copy(&ace_dest->trustee, &ace_src->trustee);
}
diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index df70740b33..6374c2d8a9 100644
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -27,7 +27,7 @@
#define TIME_OFFSET_HIGH 0x01B21DD2
#define TIME_OFFSET_LOW 0x13814000
-void smb_uuid_pack(const struct uuid uu, UUID_FLAT *ptr)
+void smb_uuid_pack(const struct GUID uu, UUID_FLAT *ptr)
{
SIVAL(ptr->info, 0, uu.time_low);
SSVAL(ptr->info, 4, uu.time_mid);
@@ -36,7 +36,7 @@ void smb_uuid_pack(const struct uuid uu, UUID_FLAT *ptr)
memcpy(ptr->info+10, uu.node, 6);
}
-void smb_uuid_unpack(const UUID_FLAT in, struct uuid *uu)
+void smb_uuid_unpack(const UUID_FLAT in, struct GUID *uu)
{
uu->time_low = IVAL(in.info, 0);
uu->time_mid = SVAL(in.info, 4);
@@ -45,15 +45,15 @@ void smb_uuid_unpack(const UUID_FLAT in, struct uuid *uu)
memcpy(uu->node, in.info+10, 6);
}
-struct uuid smb_uuid_unpack_static(const UUID_FLAT in)
+struct GUID smb_uuid_unpack_static(const UUID_FLAT in)
{
- static struct uuid uu;
+ static struct GUID uu;
smb_uuid_unpack(in, &uu);
return uu;
}
-void smb_uuid_generate_random(struct uuid *uu)
+void smb_uuid_generate_random(struct GUID *uu)
{
UUID_FLAT tmp;
@@ -64,7 +64,7 @@ void smb_uuid_generate_random(struct uuid *uu)
uu->time_hi_and_version = (uu->time_hi_and_version & 0x0FFF) | 0x4000;
}
-char *smb_uuid_to_string(const struct uuid uu)
+char *smb_uuid_to_string(const struct GUID uu)
{
char *out;
@@ -77,7 +77,7 @@ char *smb_uuid_to_string(const struct uuid uu)
return out;
}
-const char *smb_uuid_string_static(const struct uuid uu)
+const char *smb_uuid_string_static(const struct GUID uu)
{
static char out[37];
@@ -90,7 +90,7 @@ const char *smb_uuid_string_static(const struct uuid uu)
return out;
}
-BOOL smb_string_to_uuid(const char *in, struct uuid* uu)
+BOOL smb_string_to_uuid(const char *in, struct GUID* uu)
{
BOOL ret = False;
const char *ptr = in;
diff --git a/source3/libmsrpc/cac_lsarpc.c b/source3/libmsrpc/cac_lsarpc.c
index 5ff49b58d1..60c66e9aff 100644
--- a/source3/libmsrpc/cac_lsarpc.c
+++ b/source3/libmsrpc/cac_lsarpc.c
@@ -470,7 +470,7 @@ int cac_LsaQueryInfoPolicy(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, struct Lsa
char *domain_name = NULL;
char *dns_name = NULL;
char *forest_name = NULL;
- struct uuid *domain_guid = NULL;
+ struct GUID *domain_guid = NULL;
DOM_SID *domain_sid = NULL;
if(!hnd)
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index f72a7cb8d5..a1be400c46 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -158,39 +158,39 @@ BOOL secrets_fetch_domain_sid(const char *domain, DOM_SID *sid)
return True;
}
-BOOL secrets_store_domain_guid(const char *domain, struct uuid *guid)
+BOOL secrets_store_domain_guid(const char *domain, struct GUID *guid)
{
fstring key;
slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
strupper_m(key);
- return secrets_store(key, guid, sizeof(struct uuid));
+ return secrets_store(key, guid, sizeof(struct GUID));
}
-BOOL secrets_fetch_domain_guid(const char *domain, struct uuid *guid)
+BOOL secrets_fetch_domain_guid(const char *domain, struct GUID *guid)
{
- struct uuid *dyn_guid;
+ struct GUID *dyn_guid;
fstring key;
size_t size = 0;
- struct uuid new_guid;
+ struct GUID new_guid;
slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
strupper_m(key);
- dyn_guid = (struct uuid *)secrets_fetch(key, &size);
+ dyn_guid = (struct GUID *)secrets_fetch(key, &size);
if (!dyn_guid) {
if (lp_server_role() == ROLE_DOMAIN_PDC) {
smb_uuid_generate_random(&new_guid);
if (!secrets_store_domain_guid(domain, &new_guid))
return False;
- dyn_guid = (struct uuid *)secrets_fetch(key, &size);
+ dyn_guid = (struct GUID *)secrets_fetch(key, &size);
}
if (dyn_guid == NULL) {
return False;
}
}
- if (size != sizeof(struct uuid)) {
+ if (size != sizeof(struct GUID)) {
DEBUG(1,("UUID size %d is wrong!\n", (int)size));
SAFE_FREE(dyn_guid);
return False;
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 8cc0d2f7e2..b74763b2e5 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -3003,7 +3003,7 @@ static BOOL map_nt_printer_info2_to_dsspooler(NT_PRINTER_INFO_LEVEL_2 *info2)
}
static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2,
- struct uuid guid)
+ struct GUID guid)
{
int i;
REGVAL_CTR *ctr=NULL;
@@ -3015,7 +3015,7 @@ static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2,
regval_ctr_delvalue(ctr, "objectGUID");
regval_ctr_addvalue(ctr, "objectGUID", REG_BINARY,
- (char *) &guid, sizeof(struct uuid));
+ (char *) &guid, sizeof(struct GUID));
}
static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
@@ -3028,7 +3028,7 @@ static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
TALLOC_CTX *ctx;
ADS_MODLIST mods;
const char *attrs[] = {"objectGUID", NULL};
- struct uuid guid;
+ struct GUID guid;
WERROR win_rc = WERR_OK;
DEBUG(5, ("publishing printer %s\n", printer->info_2->printername));
@@ -3265,7 +3265,7 @@ WERROR check_published_printers(void)
}
BOOL is_printer_published(Printer_entry *print_hnd, int snum,
- struct uuid *guid)
+ struct GUID *guid)
{
NT_PRINTER_INFO_LEVEL *printer = NULL;
REGVAL_CTR *ctr;
@@ -3286,8 +3286,8 @@ BOOL is_printer_published(Printer_entry *print_hnd, int snum,
}
/* fetching printer guids really ought to be a separate function.. */
- if (guid && regval_size(guid_val) == sizeof(struct uuid))
- memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
+ if (guid && regval_size(guid_val) == sizeof(struct GUID))
+ memcpy(guid, regval_data_p(guid_val), sizeof(struct GUID));
free_a_printer(&printer, 2);
return True;
@@ -3304,7 +3304,7 @@ WERROR check_published_printers(void)
}
BOOL is_printer_published(Printer_entry *print_hnd, int snum,
- struct uuid *guid)
+ struct GUID *guid)
{
return False;
}
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,
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index cd2aabd056..401251286c 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 5fbf9874a0..ac8921987a 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)
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 4c798e4300..5abf1c293a 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -997,9 +997,9 @@ BOOL check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
DEBUG(10,("checking %s\n", pipe_names[i].client_pipe));
if ( strequal(pipe_names[i].client_pipe, pname)
&& (abstract->version == pipe_names[i].abstr_syntax.version)
- && (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax.uuid, sizeof(struct uuid)) == 0)
+ && (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax.uuid, sizeof(struct GUID)) == 0)
&& (transfer->version == pipe_names[i].trans_syntax.version)
- && (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid, sizeof(struct uuid)) == 0) ) {
+ && (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid, sizeof(struct GUID)) == 0) ) {
struct api_struct *fns = NULL;
int n_fns = 0;
PIPE_RPC_FNS *context_fns;
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 5f8e705ea3..16dec45318 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4262,7 +4262,7 @@ static BOOL construct_printer_info_5(Printer_entry *print_hnd, PRINTER_INFO_5 *p
static BOOL construct_printer_info_7(Printer_entry *print_hnd, PRINTER_INFO_7 *printer, int snum)
{
char *guid_str = NULL;
- struct uuid guid;
+ struct GUID guid;
if (is_printer_published(print_hnd, snum, &guid)) {
asprintf(&guid_str, "{%s}", smb_uuid_string_static(guid));
generated by cgit (git 2.34.1) at 2024-11-27 05:58:55 +0000