diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-03-11 08:49:07 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-03-25 00:45:29 +0100 |
| commit | c25b5b35794624b28a8b1dd6ab63a35b6dd5f789 (patch) | |
| tree | 40a09f63618545435ed38e4176a9fb314031fb69 /librpc/rpc | |
| parent | 5f402dcdf7a652378a7d4e08ab1e12fd929d3d5b (diff) | |
| download | samba-c25b5b35794624b28a8b1dd6ab63a35b6dd5f789.tar.gz | |
librpc/rpc: finally maintain only the object guid
This has nothing to do with ndr_syntax_id...
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'librpc/rpc')
| -rw-r--r-- | librpc/rpc/binding.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/librpc/rpc/binding.c b/librpc/rpc/binding.c index 27ea4c62029..37e0c4f54f6 100644 --- a/librpc/rpc/binding.c +++ b/librpc/rpc/binding.c @@ -37,7 +37,7 @@ struct dcerpc_binding { enum dcerpc_transport_t transport; - struct ndr_syntax_id object; + struct GUID object; const char *object_string; const char *host; const char *target_hostname; @@ -224,10 +224,10 @@ _PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_bi } } - if (!GUID_all_zero(&b->object.uuid)) { + if (!GUID_all_zero(&b->object)) { o = s; s = talloc_asprintf_append_buffer(s, "%s@", - GUID_string(mem_ctx, &b->object.uuid)); + GUID_string(mem_ctx, &b->object)); if (s == NULL) { talloc_free(o); return NULL; @@ -500,7 +500,7 @@ _PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *_s, stru _PUBLIC_ struct GUID dcerpc_binding_get_object(const struct dcerpc_binding *b) { - return b->object.uuid; + return b->object; } _PUBLIC_ NTSTATUS dcerpc_binding_set_object(struct dcerpc_binding *b, @@ -522,8 +522,7 @@ _PUBLIC_ NTSTATUS dcerpc_binding_set_object(struct dcerpc_binding *b, } talloc_free(tmp); - ZERO_STRUCT(b->object); - b->object.uuid = object; + b->object = object; return NT_STATUS_OK; } |