Fix cbdata argument to process_auth_form()
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 8 Jun 2012 02:20:05 +0000 (03:20 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 8 Jun 2012 02:20:09 +0000 (03:20 +0100)
I just introduced lots of bugs... oops.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
gnutls.c
openssl.c
ssl.c

index 66b83c9..4ecd19b 100644 (file)
--- a/gnutls.c
+++ b/gnutls.c
@@ -1140,7 +1140,7 @@ static P11KitPin *pin_callback(const char *pin_source, P11KitUri *pin_uri,
        o.label = _("Enter PIN:");
        o.value = NULL;
 
-       ret = vpninfo->process_auth_form(vpninfo, &f);
+       ret = vpninfo->process_auth_form(vpninfo->cbdata, &f);
        if (ret || !o.value)
                return NULL;
 
index fedad3d..5765358 100644 (file)
--- a/openssl.c
+++ b/openssl.c
@@ -316,7 +316,7 @@ static int ui_flush(UI *ui)
        struct ui_form_opt *opt;
        int ret;
 
-       ret = vpninfo->process_auth_form(vpninfo, &ui_data->form);
+       ret = vpninfo->process_auth_form(vpninfo->cbdata, &ui_data->form);
        if (ret)
                return 0;
 
diff --git a/ssl.c b/ssl.c
index cfc3088..e059397 100644 (file)
--- a/ssl.c
+++ b/ssl.c
@@ -309,7 +309,7 @@ int request_passphrase(struct openconnect_info *vpninfo,
        o.label = buf;
        o.value = NULL;
 
-       ret = vpninfo->process_auth_form(vpninfo, &f);
+       ret = vpninfo->process_auth_form(vpninfo->cbdata, &f);
        if (!ret) {
                *response = o.value;
                return 0;