On Sun, Sep 04, 2016 at 06:02:15PM +0200, Reyk Floeter wrote:
> On Sun, Sep 04, 2016 at 05:16:05PM +0200, Wouter Clarie wrote:
> > On OpenBSD 6.0 release, every time I run 'ikectl log verbose' or 'ikectl 
> > log brief', iked crashes. It does not matter what the iked.conf looks like. 
> > Same thing happens on 6.0-beta from end of May on bare metal. (May have 
> > been broken earlier, I don???t know.)
> > 
> > 
> 
> This should fix it.
> 
> (control needs to forward the "verbose" request to all other processes
> but it wasn't connected with the cert/ca process.  Instead of doing
> so, I relay the message over the parent now)
> 

Fix committed, thanks for the bug report.

Reyk

> Index: sbin/iked/iked.c
> ===================================================================
> RCS file: /cvs/src/sbin/iked/iked.c,v
> retrieving revision 1.30
> diff -u -p -u -p -r1.30 iked.c
> --- sbin/iked/iked.c  7 Dec 2015 12:46:37 -0000       1.30
> +++ sbin/iked/iked.c  4 Sep 2016 16:00:14 -0000
> @@ -391,6 +391,12 @@ parent_dispatch_control(int fd, struct p
>               parent_reload(env, 0, str);
>               free(str);
>               break;
> +     case IMSG_CTL_VERBOSE:
> +             proc_forward_imsg(&env->sc_ps, imsg, PROC_IKEV2, -1);
> +             proc_forward_imsg(&env->sc_ps, imsg, PROC_CERT, -1);
> +
> +             /* return 1 to let proc.c handle it locally */
> +             return (1);
>       default:
>               return (-1);
>       }
> Index: sbin/iked/control.c
> ===================================================================
> RCS file: /cvs/src/sbin/iked/control.c,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 control.c
> --- sbin/iked/control.c       5 Dec 2015 13:09:46 -0000       1.21
> +++ sbin/iked/control.c       4 Sep 2016 16:00:14 -0000
> @@ -306,7 +306,6 @@ control_dispatch_imsg(int fd, short even
>                       log_verbose(v);
>  
>                       proc_forward_imsg(&env->sc_ps, &imsg, PROC_PARENT, -1);
> -                     proc_forward_imsg(&env->sc_ps, &imsg, PROC_IKEV2, -1);
>                       break;
>               case IMSG_CTL_RELOAD:
>               case IMSG_CTL_RESET:

-- 

Reply via email to