Merge lp:~nikwen/account-polld/no-user-interaction into lp:~ubuntu-push-hackers/account-polld/trunk

[Niklas Wenzel]

Tell libsignon-glib not to open a trust session by passing SIGNON_POLICY_NO_USER_INTERACTION as the SIGNON_SESSION_DATA_UI_POLICY value (part of the issue experienced in LP: #1496773)

Tell libsignon-glib not to open a trust session by passing SIGNON_POLICY_NO_USER_INTERACTION as the SIGNON_SESSION_DATA_UI_POLICY value.

I tested this and normal operation seems to work fine. I didn't have a way of reproducing the linked bug report though.

[Alberto Mardegan (mardy)]

LGTM, thanks a lot!! :-)

review: Approve

[Jonas G. Drange (jonas-drange)]

LGTM, works well.

review: Approve

=== modified file 'accounts/account-watcher.c'
--- accounts/account-watcher.c	2015-03-20 14:34:48 +0000
+++ accounts/account-watcher.c	2015-09-24 20:10:19 +0000
@@ -155,9 +155,17 @@
         return;
     }
 
+    /* Tell libsignon-glib not to open a trust session as we have no UI */
+    GVariantBuilder builder;
+    g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add(&builder, "{sv}",
+        SIGNON_SESSION_DATA_UI_POLICY,
+        g_variant_new_int32(SIGNON_POLICY_NO_USER_INTERACTION));
+
     info->auth_params = g_variant_ref_sink(
         ag_auth_data_get_login_parameters(
-            auth_data, NULL));
+            auth_data,
+            g_variant_builder_end(&builder)));
 
     signon_auth_session_process_async(
         info->session,