svn commit: samba r25495 - in branches: SAMBA_3_2/source/lib/replace/system SAMBA_3_2_0/source/lib/replace/system

[simo]

On Wed, 2007-10-03 at 22:01 +0000, jra at samba.org wrote:
> Author: jra
> Date: 2007-10-03 22:01:25 +0000 (Wed, 03 Oct 2007)
> New Revision: 25495
> 
> WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25495
> 
> Log:
> Fixup definitions for missing sockaddr_storage.
> Jeremy.
> 
> Modified:
>    branches/SAMBA_3_2/source/lib/replace/system/network.h
>    branches/SAMBA_3_2_0/source/lib/replace/system/network.h
> 
> 
> Changeset:
> Modified: branches/SAMBA_3_2/source/lib/replace/system/network.h
> ===================================================================
> --- branches/SAMBA_3_2/source/lib/replace/system/network.h	2007-10-03 21:14:20 UTC (rev 25494)
> +++ branches/SAMBA_3_2/source/lib/replace/system/network.h	2007-10-03 22:01:25 UTC (rev 25495)
> @@ -127,7 +127,8 @@
>  #endif
>  
>  #ifndef HAVE_SOCKADDR_STORAGE
> -#define sockaddr_storage sockaddr
> +#define sockaddr_storage sockaddr_in

shouldn't this be:
#define sockaddr_storage sockaddr_in6
?

sockarrd_in6 is bigger in size

Actually even that looks wrong ...


bits/socket.h on my system has this:

struct sockaddr_storage
  {
    __SOCKADDR_COMMON (ss_);    /* Address family, etc.  */
    __ss_aligntype __ss_align;  /* Force desired alignment.  */
    char __ss_padding[_SS_PADSIZE];
  };


Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer
email: idra at samba.org
http://samba.org