r5148: use ipv4_addr also in epmapper idl

metze
(This used to be commit cbc1f172822363e1fc4495d27248464403748cae)

3 files changed, 7 insertions, 7 deletions

diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index 9e59f721bf..ba5770b305 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -99,7 +99,7 @@ interface epmapper
 	} epm_rhs_tcp;
 
 	typedef struct {
-		uint32 address;
+		ipv4_addr ipaddr;
 	} epm_rhs_ip;
 
 	typedef struct {
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index a05ad7c897..7639ca3fdd 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -386,13 +386,13 @@ const char *dcerpc_floor_get_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor *flo
 		return talloc_asprintf(mem_ctx, "%d", floor->rhs.http.port);
 
 	case EPM_PROTOCOL_IP:
-		if (floor->rhs.ip.address == 0) {
+		if (floor->rhs.ip.ipaddr.addr == 0) {
 			return NULL; 
 		}
 
 		{
 			struct ipv4_addr in;
-			in.addr = htonl(floor->rhs.ip.address);
+			in.addr = htonl(floor->rhs.ip.ipaddr.addr);
 			return talloc_strdup(mem_ctx, sys_inet_ntoa(in));
 		}
 
@@ -458,9 +458,9 @@ static NTSTATUS dcerpc_floor_set_rhs_data(TALLOC_CTX *mem_ctx, struct epm_floor
 
 	case EPM_PROTOCOL_IP:
 		if (strlen(data) > 0) {
-			floor->rhs.ip.address = ntohl(interpret_addr(data));
+			floor->rhs.ip.ipaddr.addr = ntohl(interpret_addr(data));
 		} else {
-			floor->rhs.ip.address = 0;
+			floor->rhs.ip.ipaddr.addr = 0;
 		}
 		return NT_STATUS_OK;
 
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index 4fcd0757f0..ea1166b4ed 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -66,7 +66,7 @@ static void display_tower(TALLOC_CTX *mem_ctx, struct epm_tower *twr)
 			printf(" IP:");
 			{
 				struct ipv4_addr in;
-				in.addr = htonl(rhs->ip.address);
+				in.addr = htonl(rhs->ip.ipaddr.addr);
 				printf("%s", sys_inet_ntoa(in));
 			}
 			break;
@@ -158,7 +158,7 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	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;
+	twr->tower.floors[4].rhs.ip.ipaddr.addr = 0;
 
 	status = dcerpc_epm_Map(p, mem_ctx, &r);
 	if (NT_STATUS_IS_OK(status) && r.out.result == 0) {