[PATCH 6/7] Fix nm_process_auth_form() to clear 'form_grabbed' and cancel keyring ops (cherry picked from commit 96a0741b154dbb3a629038b34c89469b9bd11adb)
- From: Murilo Opsfelder Araujo <muriloo linux vnet ibm com>
- To: networkmanager-list gnome org
- Cc: David Woodhouse intel com
- Subject: [PATCH 6/7] Fix nm_process_auth_form() to clear 'form_grabbed' and cancel keyring ops (cherry picked from commit 96a0741b154dbb3a629038b34c89469b9bd11adb)
- Date: Wed, 24 Oct 2012 21:21:32 -0200
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().
(cherry picked from commit 96a0741b154dbb3a629038b34c89469b9bd11adb)
Signed-off-by: Murilo Opsfelder Araujo <muriloo linux vnet ibm com>
Conflicts:
auth-dialog/main.c
---
auth-dialog/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index 7906614..834a36b 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -809,7 +809,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,
--
1.8.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]