[network-manager-openconnect] Fix nm_process_auth_form() to clear 'form_grabbed' and cancel keyring ops
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect] Fix nm_process_auth_form() to clear 'form_grabbed' and cancel keyring ops
- Date: Sat, 16 Jun 2012 00:51:03 +0000 (UTC)
commit 96a0741b154dbb3a629038b34c89469b9bd11adb
Author: David Woodhouse <David Woodhouse intel com>
Date: Sat Jun 16 01:24:02 2012 +0100
Fix nm_process_auth_form() to clear 'form_grabbed' and cancel keyring ops
These were being done in the obsolete ui_flush() function which handled
OpenSSL UI callbacks (that libopenconnect.so.2 now catches and translates
into auth_forms). But not in nm_process_auth_form().
auth-dialog/main.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 1eb0997..82243ba 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -735,6 +735,10 @@ static int nm_process_auth_form (void *cbdata, struct oc_auth_form *form)
while (!g_queue_is_empty (ui_data->form_entries)) {
ui_fragment_data *data;
data = g_queue_pop_tail (ui_data->form_entries);
+
+ if (data->find_request)
+ gnome_keyring_cancel_request(data->find_request);
+
if (data->entry_text) {
data->opt->value = g_strdup (data->entry_text);
@@ -764,7 +768,7 @@ static int nm_process_auth_form (void *cbdata, struct oc_auth_form *form)
}
}
-
+ ui_data->form_grabbed = 0;
g_mutex_unlock(ui_data->form_mutex);
/* -1 = cancel,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]