svn commit: r301967 - head/usr.sbin/rpcbind/tests

[Alan Somers]

Author: asomers
Date: Thu Jun 16 15:25:37 2016
New Revision: 301967
URL: https://svnweb.freebsd.org/changeset/base/301967

Log:
  Fix usr.sbin/rpcbind ATF tests on 32-bit platforms
  
  usr.sbin/rpcbind/tests/addrmerge_test.c
  	Fix some sizeof calculations that work only by luck on 64-bit
  	platforms.
  
  PR:		210314
  Reviewed by:	ngie
  Approved by:	re (kib)
  Reported by:	Mark Millard
  MFC after:	4 weeks
  Sponsored by:	Spectra Logic Corp
  Differential Revision:	https://reviews.freebsd.org/D6855

Modified:
  head/usr.sbin/rpcbind/tests/addrmerge_test.c

Modified: head/usr.sbin/rpcbind/tests/addrmerge_test.c
==============================================================================
--- head/usr.sbin/rpcbind/tests/addrmerge_test.c	Thu Jun 16 14:26:04 2016	(r301966)
+++ head/usr.sbin/rpcbind/tests/addrmerge_test.c	Thu Jun 16 15:25:37 2016	(r301967)
@@ -92,15 +92,15 @@ mock_ifaddr4(const char* name, const cha
 
 	in->sin_family = AF_INET;
 	in->sin_port = 0;
-	in->sin_len = sizeof(in);
+	in->sin_len = sizeof(*in);
 	in->sin_addr.s_addr = inet_addr(addr);
 	mask_in->sin_family = AF_INET;
 	mask_in->sin_port = 0;
-	mask_in->sin_len = sizeof(mask_in);
+	mask_in->sin_len = sizeof(*mask_in);
 	mask_in->sin_addr.s_addr = inet_addr(mask);
 	bcast_in->sin_family = AF_INET;
 	bcast_in->sin_port = 0;
-	bcast_in->sin_len = sizeof(bcast_in);
+	bcast_in->sin_len = sizeof(*bcast_in);
 	bcast_in->sin_addr.s_addr = inet_addr(bcast);
 	*ifaddr = (struct ifaddrs) {
 		.ifa_next = NULL,