svn commit: samba r10129 - in branches/SAMBA_4_0/source: libcli/wrepl librpc/idl

[metze at samba.org]

Author: metze
Date: 2005-09-09 19:55:34 +0000 (Fri, 09 Sep 2005)
New Revision: 10129

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10129

Log:
fix sinple ip's in wins replication, packets

metze
Modified:
   branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
   branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c	2005-09-09 19:21:26 UTC (rev 10128)
+++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c	2005-09-09 19:55:34 UTC (rev 10129)
@@ -672,10 +672,9 @@
 			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);
 		}
 	}
 

Modified: branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl	2005-09-09 19:21:26 UTC (rev 10128)
+++ branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl	2005-09-09 19:55:34 UTC (rev 10129)
@@ -27,11 +27,10 @@
 	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 @@
 		[flag(NDR_LITTLE_ENDIAN)] uint32 group_flag;
 		udlongr   id;
 		[switch_is(flags & 2)] wrepl_addresses addresses;
+		ipv4address unknown;
 	} wrepl_wins_name;
 
 	typedef struct {