summaryrefslogtreecommitdiff
path: root/source4/librpc/rpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-10-21 10:52:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:02:22 -0500
commitaa1c83bdbb7fb6d218ac5965433094fe127fc173 (patch)
treef8834b95bdaa5bd8957a22a9411ea672f32394bb /source4/librpc/rpc
parent6a304256d00e225872a06d1ec10152629352f41c (diff)
downloadsamba-aa1c83bdbb7fb6d218ac5965433094fe127fc173.tar.gz
samba-aa1c83bdbb7fb6d218ac5965433094fe127fc173.tar.bz2
samba-aa1c83bdbb7fb6d218ac5965433094fe127fc173.zip
r3111: Add a few more protocol identifiers, rhs for ncalrpc
(This used to be commit 53567a83cbca9df60bef76a15df24d2cd89a16b0)
Diffstat (limited to 'source4/librpc/rpc')
-rw-r--r--source4/librpc/rpc/dcerpc_util.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index ccb7f126ea..d034dd89d0 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -62,37 +62,37 @@ NTSTATUS dcerpc_epm_map_tcp_port(const char *server,
ZERO_STRUCT(handle);
ZERO_STRUCT(guid);
- twr.towers.num_floors = 5;
- twr.towers.floors = talloc(p, sizeof(twr.towers.floors[0]) * 5);
+ twr.tower.num_floors = 5;
+ twr.tower.floors = talloc(p, sizeof(twr.tower.floors[0]) * 5);
/* what I'd like for christmas ... */
/* an RPC interface ... */
- twr.towers.floors[0].lhs.protocol = EPM_PROTOCOL_UUID;
- GUID_from_string(uuid, &twr.towers.floors[0].lhs.info.uuid.uuid);
- twr.towers.floors[0].lhs.info.uuid.version = version;
- twr.towers.floors[0].rhs.uuid.unknown = 0;
+ twr.tower.floors[0].lhs.protocol = EPM_PROTOCOL_UUID;
+ GUID_from_string(uuid, &twr.tower.floors[0].lhs.info.uuid.uuid);
+ twr.tower.floors[0].lhs.info.uuid.version = version;
+ twr.tower.floors[0].rhs.uuid.unknown = 0;
/* 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 = NDR_GUID_VERSION;
- twr.towers.floors[1].rhs.uuid.unknown = 0;
+ twr.tower.floors[1].lhs.protocol = EPM_PROTOCOL_UUID;
+ GUID_from_string(NDR_GUID, &twr.tower.floors[1].lhs.info.uuid.uuid);
+ twr.tower.floors[1].lhs.info.uuid.version = NDR_GUID_VERSION;
+ twr.tower.floors[1].rhs.uuid.unknown = 0;
/* on an RPC connection ... */
- twr.towers.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN;
- twr.towers.floors[2].lhs.info.lhs_data = data_blob(NULL, 0);
- twr.towers.floors[2].rhs.ncacn.minor_version = 0;
+ twr.tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN;
+ twr.tower.floors[2].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr.tower.floors[2].rhs.ncacn.minor_version = 0;
/* on a TCP port ... */
- twr.towers.floors[3].lhs.protocol = EPM_PROTOCOL_TCP;
- twr.towers.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
- twr.towers.floors[3].rhs.tcp.port = 0;
+ twr.tower.floors[3].lhs.protocol = EPM_PROTOCOL_TCP;
+ twr.tower.floors[3].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr.tower.floors[3].rhs.tcp.port = 0;
/* on an IP link ... */
- twr.towers.floors[4].lhs.protocol = EPM_PROTOCOL_IP;
- twr.towers.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
- twr.towers.floors[4].rhs.ip.address = 0;
+ twr.tower.floors[4].lhs.protocol = EPM_PROTOCOL_IP;
+ twr.tower.floors[4].lhs.info.lhs_data = data_blob(NULL, 0);
+ twr.tower.floors[4].rhs.ip.address = 0;
/* with some nice pretty paper around it of course */
r.in.object = &guid;
@@ -117,13 +117,13 @@ NTSTATUS dcerpc_epm_map_tcp_port(const char *server,
return NT_STATUS_PORT_UNREACHABLE;
}
- if (twr_r->towers.num_floors != 5 ||
- twr_r->towers.floors[3].lhs.protocol != twr.towers.floors[3].lhs.protocol) {
+ if (twr_r->tower.num_floors != 5 ||
+ twr_r->tower.floors[3].lhs.protocol != twr.tower.floors[3].lhs.protocol) {
dcerpc_pipe_close(p);
return NT_STATUS_PORT_UNREACHABLE;
}
- *port = twr_r->towers.floors[3].rhs.tcp.port;
+ *port = twr_r->tower.floors[3].rhs.tcp.port;
dcerpc_pipe_close(p);