summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-09-09 19:55:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:01 -0500
commit9cd63ddb5d9f4c5191a8b4b32c99de4c72344111 (patch)
treed8b356528a32e642012bd9df7e3a60c49d64b764
parent9ad5c988a4d2226c4c9a7f1f02d8ad44024c7cfd (diff)
downloadsamba-9cd63ddb5d9f4c5191a8b4b32c99de4c72344111.tar.gz
samba-9cd63ddb5d9f4c5191a8b4b32c99de4c72344111.tar.bz2
samba-9cd63ddb5d9f4c5191a8b4b32c99de4c72344111.zip
r10129: fix sinple ip's in wins replication, packets
metze (This used to be commit 7492afa48db68ee29048f8e1a56ccff712a3d162)
-rw-r--r--source4/libcli/wrepl/winsrepl.c5
-rw-r--r--source4/librpc/idl/winsrepl.idl4
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index 910bed278c..516c72ef29 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -672,10 +672,9 @@ NTSTATUS wrepl_pull_names_recv(struct wrepl_request *req,
name->num_addresses = 1;
name->addresses = talloc(io->out.names, struct wrepl_address);
if (name->addresses == NULL) goto failed;
- name->addresses[0].owner = talloc_steal(name->addresses,
- wname->addresses.address.owner);
+ name->addresses[0].owner = io->in.partner.address;
name->addresses[0].address = talloc_steal(name->addresses,
- wname->addresses.address.ip);
+ wname->addresses.ip);
}
}
diff --git a/source4/librpc/idl/winsrepl.idl b/source4/librpc/idl/winsrepl.idl
index 986b16ce04..8adc3c9b25 100644
--- a/source4/librpc/idl/winsrepl.idl
+++ b/source4/librpc/idl/winsrepl.idl
@@ -27,11 +27,10 @@ interface wrepl
typedef [flag(NDR_LITTLE_ENDIAN)] struct {
uint32 num_ips;
wrepl_ip ips[num_ips];
- ipv4address unknown;
} wrepl_address_list;
typedef [nodiscriminant] union {
- [case(0)] wrepl_ip address;
+ [case(0)] ipv4address ip;
[case(2)] wrepl_address_list addresses;
} wrepl_addresses;
@@ -42,6 +41,7 @@ interface wrepl
[flag(NDR_LITTLE_ENDIAN)] uint32 group_flag;
udlongr id;
[switch_is(flags & 2)] wrepl_addresses addresses;
+ ipv4address unknown;
} wrepl_wins_name;
typedef struct {