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/rpc_server | |
| 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/rpc_server')
| -rw-r--r-- | source4/rpc_server/epmapper/rpc_epmapper.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/handles.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c index 6d96850917..8f4450c2ef 100644 --- a/source4/rpc_server/epmapper/rpc_epmapper.c +++ b/source4/rpc_server/epmapper/rpc_epmapper.c @@ -227,7 +227,7 @@ static error_status_t epm_Map(struct dcesrv_call_state *dce_call, TALLOC_CTX *me for (i=0;i<count;i++) { struct epm_tower t; - if (!uuid_equal(&floors[0].lhs.info.uuid.uuid, &eps[i].ep_description.object) || + if (!GUID_equal(&floors[0].lhs.info.uuid.uuid, &eps[i].ep_description.object) || floors[0].lhs.info.uuid.version != eps[i].ep_description.object_version) { continue; } diff --git a/source4/rpc_server/handles.c b/source4/rpc_server/handles.c index 34ed42799f..41169aa25d 100644 --- a/source4/rpc_server/handles.c +++ b/source4/rpc_server/handles.c @@ -40,7 +40,7 @@ struct dcesrv_handle *dcesrv_handle_new(struct dcesrv_connection *dce_conn, h->destroy = NULL; h->wire_handle.handle_type = handle_type; - uuid_generate_random(&h->wire_handle.uuid); + h->wire_handle.uuid = GUID_random(); DLIST_ADD(dce_conn->handles, h); @@ -77,7 +77,7 @@ struct dcesrv_handle *dcesrv_handle_fetch(struct dcesrv_connection *dce_conn, for (h=dce_conn->handles; h; h=h->next) { if (h->wire_handle.handle_type == p->handle_type && - uuid_equal(&p->uuid, &h->wire_handle.uuid)) { + GUID_equal(&p->uuid, &h->wire_handle.uuid)) { if (handle_type != DCESRV_HANDLE_ANY && p->handle_type != handle_type) { DEBUG(0,("client gave us the wrong handle type (%d should be %d)\n", |