[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-161-g4d7badb

[Stefan (metze) Metzmacher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Jeremy,

>     Fix Solaris by ensuring we use the IPv4 or IPv6 length
>     in any getnameinfo calls.
>     Jeremy

> @@ -710,22 +720,23 @@ int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
>  	for (i=0;i<total;i++) {
>  		char addr[INET6_ADDRSTRLEN];
>  		int ret;
> +		socklen_t sl;

this seems unused.

>  		printf("%-10s ", ifaces[i].name);
>  		addr[0] = '\0';
>  		ret = getnameinfo((struct sockaddr *)&ifaces[i].ip,
> -				sizeof(ifaces[i].ip),
> +				calc_sa_size(&ifaces[i].ip),
>  				addr, sizeof(addr),
>  				NULL, 0, NI_NUMERICHOST);
>  		printf("IP=%s ", addr);
>  		addr[0] = '\0';
>  		ret = getnameinfo((struct sockaddr *)&ifaces[i].netmask,
> -				sizeof(ifaces[i].netmask),
> +				calc_sa_size(&ifaces[i].netmask),
>  				addr, sizeof(addr),
>  				NULL, 0, NI_NUMERICHOST);
>  		printf("NETMASK=%s ", addr);
>  		addr[0] = '\0';
>  		ret = getnameinfo((struct sockaddr *)&ifaces[i].bcast,
> -				sizeof(ifaces[i].bcast),
> +				calc_sa_size(&ifaces[i].bcast),
>  				addr, sizeof(addr),
>  				NULL, 0, NI_NUMERICHOST);
>  		printf("BCAST=%s\n", addr);

metze
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD4DBQFHLCzpm70gjA5TCD8RAqXiAJiR0PGtZP0cMGMTFfyBcOy71CyPAKC5t2pQ
HSj4vxF4m0EeglKR8HVfZg==
=dDbD
-----END PGP SIGNATURE-----