[Dovecot] Re: [dovecot-cvs] dovecot/src/lib fdpass.c,1.28,1.29

[Charlie Allom]

Will this perhaps fix these?

imap-login: Jun 15 12:28:16 Panic: file ioloop.c: line 90: assertion
failed: (i
o->fd <= current_ioloop->highest_fd)
dovecot: Jun 15 12:28:16 Error: child 17987 (login) killed with signal 6
imap-login: Jun 15 13:14:58 Panic: file ioloop.c: line 90: assertion
failed: (i
o->fd <= current_ioloop->highest_fd)
dovecot: Jun 15 13:14:58 Error: child 13002 (login) killed with signal 6


On Tue, Jun 15, 2004 at 02:42:25AM +0300, cras at procontrol.fi wrote:
> Update of /home/cvs/dovecot/src/lib
> In directory talvi:/tmp/cvs-serv11171
> 
> Modified Files:
> 	fdpass.c 
> Log Message:
> Solaris fix by Tim Hurman
> 
> 
> 
> Index: fdpass.c
> ===================================================================
> RCS file: /home/cvs/dovecot/src/lib/fdpass.c,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -d -r1.28 -r1.29
> --- fdpass.c	1 Dec 2003 19:07:34 -0000	1.28
> +++ fdpass.c	14 Jun 2004 23:42:23 -0000	1.29
> @@ -31,12 +31,20 @@
>  #include <sys/uio.h>
>  
>  #ifndef CMSG_SPACE
> -#  define CMSG_ALIGN(len) \
> +#  if defined(_CMSG_DATA_ALIGN) && defined(_CMSG_HDR_ALIGN)  /* for Solaris */
> +#    define CMSG_ALIGN(len) _CMSG_DATA_ALIGN(len)
> +#    define CMSG_SPACE(len) \
> +	(_CMSG_DATA_ALIGN(len) + _CMSG_HDR_ALIGN(sizeof(struct cmsghdr)))
> +#    define CMSG_LEN(len) \
> +	(_CMSG_HDR_ALIGN(sizeof(struct cmsghdr)) + (len))
> +#  else
> +#    define CMSG_ALIGN(len) \
>  	(((len) + sizeof(size_t) - 1) & ~(sizeof(size_t) - 1))
> -#  define CMSG_SPACE(len) \
> +#    define CMSG_SPACE(len) \
>  	(CMSG_ALIGN(len) + CMSG_ALIGN(sizeof(struct cmsghdr)))
> -#  define CMSG_LEN(len) \
> +#    define CMSG_LEN(len) \
>  	(CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
> +#  endif
>  #endif
>  
>  #ifdef SCM_RIGHTS
> 

-- 
.signature
0x14AA7941
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 186 bytes
Desc: not available
URL: <http://dovecot.org/pipermail/dovecot/attachments/20040615/7072c87b/attachment-0001.bin>