summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-11-26 03:41:06 +0000
committerAndrew Tridgell <tridge@samba.org>2003-11-26 03:41:06 +0000
commitfca5f780326f44cf7b26fe0f99244be34cc1a6ab (patch)
tree4e60c03375b761523df05fed4e3c87ebf9d0a524
parentfffd741a7a00b07c85eec254b8cc7c2fe40cef18 (diff)
downloadsamba-fca5f780326f44cf7b26fe0f99244be34cc1a6ab.tar.gz
samba-fca5f780326f44cf7b26fe0f99244be34cc1a6ab.tar.bz2
samba-fca5f780326f44cf7b26fe0f99244be34cc1a6ab.zip
use the IDL defined NDR version number
(This used to be commit 00e0c14b76c9b001c7d7b6b18b2cb543a57fe082)
-rw-r--r--source4/librpc/idl/epmapper.idl2
-rw-r--r--source4/librpc/rpc/dcerpc_util.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index 6fa9a7bd60..78070aefff 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -22,7 +22,7 @@ interface epmapper
/* this guid indicates NDR encoding in a protocol tower */
const string NDR_GUID = "8a885d04-1ceb-11c9-9fe8-08002b104860";
- const string NDR_GUID_VERSION = 1;
+ const string NDR_GUID_VERSION = 2;
typedef struct {
GUID uuid;
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 75799c1a0b..32d940bc88 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -94,7 +94,7 @@ NTSTATUS dcerpc_epm_map_tcp_port(const char *server,
/* encoded with NDR ... */
twr.towers.floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
GUID_from_string(NDR_GUID, &twr.towers.floors[1].lhs.info.uuid.uuid);
- twr.towers.floors[1].lhs.info.uuid.version = 2;
+ twr.towers.floors[1].lhs.info.uuid.version = NDR_GUID_VERSION;
twr.towers.floors[1].rhs.rhs_data = data_blob_talloc(p->mem_ctx, NULL, 2);
/* on an RPC connection ... */
@@ -112,6 +112,7 @@ NTSTATUS dcerpc_epm_map_tcp_port(const char *server,
twr.towers.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
twr.towers.floors[4].rhs.rhs_data = data_blob_talloc(p->mem_ctx, NULL, 4);
+ /* with some nice pretty paper around it of course */
r.in.object = &guid;
r.in.map_tower = &twr;
r.in.entry_handle = &handle;