On Wed, Jan 28, 2009 at 11:06:03AM +0100, Jim Meyering wrote:
john.levon(a)sun.com wrote:
> Fix misuse of PF_UNIX
>
> PF_UNIX is a protocol familay, not a valid protocol, so isn't suitable
> for the 3rd socket() argument. Solaris should be ignoring the invalid
> protocol anyway, but this fix is correct regardless.
>
> Signed-off-by: John Levon <john.levon(a)sun.com>
>
> diff --git a/src/xend_internal.c b/src/xend_internal.c
> --- a/src/xend_internal.c
> +++ b/src/xend_internal.c
> @@ -752,7 +752,11 @@ xenDaemonOpen_unix(virConnectPtr conn, c
>
> memset(&priv->addr, 0, sizeof(priv->addr));
> priv->addrfamily = AF_UNIX;
> - priv->addrprotocol = PF_UNIX;
> + /*
> + * This must be zero on Solaris at least for AF_UNIX (which should
> + * really be PF_UNIX, but doesn't matter).
> + */
> + priv->addrprotocol = 0;
> priv->addrlen = sizeof(struct sockaddr_un);
>
> addr = (struct sockaddr_un *)&priv->addr;
This looks like a fine change, especially
since the general recommendation is to specify protocol as 0.
Considering the above and that this is a bug fix, I'd drop the
comment altogether.
No, please don't drop the comment - the lack of such a warning comment is
why I considered it safe to add the PF_UNIX setting in the first place
Daniel
--
|: Red Hat, Engineering, London -o-
http://people.redhat.com/berrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org -o-
http://ovirt.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|