diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-11-25 20:03:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:09 -0500 |
| commit | e90061865467600a9d8a34f92e60a296cbf19234 (patch) | |
| tree | 55919aa76141d312b5c288326489dc7b77c81061 /source4/lib/dcom/common | |
| parent | 3308087bae76a99c02687bd11f4237d803f9f605 (diff) | |
| download | samba-e90061865467600a9d8a34f92e60a296cbf19234.tar.gz samba-e90061865467600a9d8a34f92e60a296cbf19234.tar.bz2 samba-e90061865467600a9d8a34f92e60a296cbf19234.zip | |
r3972: use GUID_* naming context and move GUID_* functions to one place
metze
(This used to be commit 523e6acf4fec5d4946fa7c0c89f40d7d712c9f3a)
Diffstat (limited to 'source4/lib/dcom/common')
| -rw-r--r-- | source4/lib/dcom/common/main.c | 8 | ||||
| -rw-r--r-- | source4/lib/dcom/common/tables.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/dcom/common/main.c b/source4/lib/dcom/common/main.c index 3730137268..61fd7d3ff7 100644 --- a/source4/lib/dcom/common/main.c +++ b/source4/lib/dcom/common/main.c @@ -162,7 +162,7 @@ static WERROR dcom_create_object_remote(struct dcom_context *ctx, struct GUID *c ZERO_STRUCT(r.in); r.in.this.version.MajorVersion = COM_MAJOR_VERSION; r.in.this.version.MinorVersion = COM_MINOR_VERSION; - uuid_generate_random(&r.in.this.cid); + r.in.this.cid = GUID_random(); r.in.Clsid = *clsid; r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY; r.in.num_protseqs = ARRAY_SIZE(protseq); @@ -279,7 +279,7 @@ WERROR dcom_get_class_object_remote(struct dcom_context *ctx, struct GUID *clsid ZERO_STRUCT(r.in); r.in.this.version.MajorVersion = COM_MAJOR_VERSION; r.in.this.version.MinorVersion = COM_MINOR_VERSION; - uuid_generate_random(&r.in.this.cid); + r.in.this.cid = GUID_random(); r.in.Clsid = *clsid; r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY; r.in.num_protseqs = ARRAY_SIZE(protseq); @@ -355,7 +355,7 @@ NTSTATUS dcom_get_pipe (struct dcom_interface_p *iface, struct dcerpc_pipe **p) iid = iface->interface->iid; if (iface->ox->pipe) { - if (!uuid_equal(&iface->ox->pipe->syntax.uuid, &iid)) { + if (!GUID_equal(&iface->ox->pipe->syntax.uuid, &iid)) { iface->ox->pipe->syntax.uuid = iid; status = dcerpc_alter(iface->ox->pipe, iface->ctx); if (NT_STATUS_IS_ERR(status)) { @@ -538,7 +538,7 @@ struct dcom_interface_p *dcom_new_local_ifacep(struct dcom_context *ctx, const s ip->ctx = ctx; ip->interface = iface; ip->vtable = vtable; - uuid_generate_random(&ip->ipid); + ip->ipid = GUID_random(); ip->object = object; ip->objref_flags = 0; ip->orpc_flags = 0; diff --git a/source4/lib/dcom/common/tables.c b/source4/lib/dcom/common/tables.c index f615662b47..6b0d99cae3 100644 --- a/source4/lib/dcom/common/tables.c +++ b/source4/lib/dcom/common/tables.c @@ -37,7 +37,7 @@ const struct dcom_interface *dcom_interface_by_iid(const struct GUID *iid) while(l) { - if (uuid_equal(iid, &l->interface.iid)) + if (GUID_equal(iid, &l->interface.iid)) return &l->interface; l = l->next; @@ -52,7 +52,7 @@ const struct dcom_class *dcom_class_by_clsid(const struct GUID *clsid) while(c) { - if (uuid_equal(clsid, &c->class.clsid)) { + if (GUID_equal(clsid, &c->class.clsid)) { return &c->class; } |