On Thu, Jun 21, 2018 at 08:36:02AM +0200, David Woodhouse wrote: > > > On Thu, 2018-06-21 at 04:37 +0000, Robin H. Johnson wrote: > > --- a/mainloop.c > > +++ b/mainloop.c > > @@ -307,7 +307,7 @@ int openconnect_mainloop(struct openconnect_info *vpninfo, > > ?#endif > > ????????} > > ? > > -???????if (vpninfo->quit_reason && vpninfo->proto->vpn_close_session) > > +???????if (vpninfo->quit_reason && vpninfo->proto->vpn_close_session && vpninfo->logout) > > ????????????????vpninfo->proto->vpn_close_session(vpninfo, vpninfo->quit_reason); > > ? > > ????????if (tun_is_up(vpninfo)) > > Hm... do we need the 'logout' flag in vpninfo at all? The same > behaviour was achievable with OC_CMD_DETACH (which happens when > openconnect receives SIGHUP), wasn't it? ?Could you do it with a purely > local static 'nologout' in main.c and something like this... (snip) Yes, that's a much cleaner path to implementation. Do you need me to spin it as a patch, or is your diff below good? -- Robin Hugh Johnson Gentoo Linux: Dev, Infra Lead, Foundation Treasurer E-Mail : robbat2 at gentoo.org GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85 GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 1113 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/openconnect-devel/attachments/20180621/4998b980/attachment.sig>
