Fix invalid progress callback on socket cancellation

Oops! This caused the KDE auth-dialog to die because we pass it back
the wrong pointer.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/ssl.c b/ssl.c
index 22e968b..7f28753 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -996,7 +996,7 @@ static int cancellable_connect(struct openconnect_info *vpninfo, int sockfd,
           including a 'cancelfd' here too. */
        select(maxfd + 1, &rd_set, &wr_set, NULL, NULL);
        if (vpninfo->cancel_fd != -1 && FD_ISSET(vpninfo->cancel_fd, &rd_set)) {
-               vpninfo->progress(vpninfo, PRG_ERR, _("Socket connect cancelled\n"));
+               vpn_progress(vpninfo, PRG_ERR, _("Socket connect cancelled\n"));
                errno = EINTR;
                return -1;
        }

diff --git a/www/changelog.xml b/www/changelog.xml
index c9abf6a..99c7ad6 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -18,6 +18,7 @@
    <li><b>OpenConnect HEAD</b>
      <ul>
        <li>Cope with non-keepalive HTTP response on authentication success.</li>
+       <li>Fix progress callback with incorrect <tt>cbdata</tt> which caused KDE crash.</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-3.19.tar.gz">OpenConnect v3.19</a></b>