Merge lp:~robert-ancell/lightdm/system-user into lp:lightdm

[Robert Ancell]

Don't pass system user accounts from AccountsService to greeters

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/lightdm-ci/215/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/9

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/lightdm-ci/215/rebuild

review: Approve (continuous-integration)

=== modified file 'liblightdm-gobject/user.c'
--- liblightdm-gobject/user.c	2013-10-29 23:38:29 +0000
+++ liblightdm-gobject/user.c	2013-11-06 23:41:35 +0000
@@ -436,8 +436,8 @@
     LightDMUserPrivate *priv = GET_USER_PRIVATE (user);  
 
     g_debug ("User %s changed", priv->path);
-    load_accounts_user (user);
-    g_signal_emit (user, user_signals[CHANGED], 0);
+    if (load_accounts_user (user))
+        g_signal_emit (user, user_signals[CHANGED], 0);
 }
 
 static gboolean
@@ -447,6 +447,7 @@
     GVariant *result, *value;
     GVariantIter *iter;
     gchar *name;
+    gboolean system_account = FALSE;
     GError *error = NULL;
 
     /* Get the properties for this user */
@@ -497,6 +498,8 @@
             g_free (priv->home_directory);
             priv->home_directory = g_variant_dup_string (value, NULL);
         }
+        else if (strcmp (name, "SystemAccount") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
+            system_account = g_variant_get_boolean (value);
         else if (strcmp (name, "Language") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
         {
             if (priv->language)
@@ -545,7 +548,9 @@
 
     g_variant_unref (result);
 
-    return TRUE;
+    priv->loaded_values = TRUE;
+
+    return !system_account;
 }
 
 static void
@@ -561,10 +566,15 @@
     g_debug ("User %s added", path);
     priv->user_list = user_list;
     priv->path = g_strdup (path);
-    list_priv->users = g_list_insert_sorted (list_priv->users, user, compare_user);
     g_signal_connect (user, "changed", G_CALLBACK (user_changed_cb), NULL);
-    if (emit_signal)
-        g_signal_emit (user_list, list_signals[USER_ADDED], 0, user);
+    if (load_accounts_user (user))
+    {
+        list_priv->users = g_list_insert_sorted (list_priv->users, user, compare_user);
+        if (emit_signal)      
+            g_signal_emit (user_list, list_signals[USER_ADDED], 0, user);
+    }
+    else
+        g_object_unref (user);
 }
 
 static void
@@ -1111,9 +1121,7 @@
         return;
     priv->loaded_values = TRUE;
 
-    if (priv->path)
-        load_accounts_user (user);
-    else
+    if (!priv->path)
         load_dmrc (user);
 }
 

=== modified file 'tests/scripts/users.conf'
--- tests/scripts/users.conf	2013-10-29 23:47:30 +0000
+++ tests/scripts/users.conf	2013-11-06 23:41:35 +0000
@@ -43,6 +43,10 @@
 #?GREETER-X-0 LOG-USER USERNAME=have-password2
 #?GREETER-X-0 LOG-USER USERNAME=have-password3
 
+# Add a system user (ignored)
+#?*ADD-USER USERNAME=lightdm
+#?RUNNER ADD-USER USERNAME=lightdm
+
 # Remove a user
 #?*DELETE-USER USERNAME=have-password3
 #?RUNNER DELETE-USER USERNAME=have-password3

=== modified file 'tests/src/test-runner.c'
--- tests/src/test-runner.c	2013-10-30 01:15:07 +0000
+++ tests/src/test-runner.c	2013-11-06 23:41:35 +0000
@@ -1665,7 +1665,7 @@
         for (link = accounts_users; link; link = link->next)
         {
             AccountsUser *user = link->data;
-            if (!user->hidden)
+            if (!user->hidden && user->uid >= 1000)
                 g_variant_builder_add_value (&builder, g_variant_new_object_path (user->path));
         }
 
@@ -1733,6 +1733,8 @@
         return g_variant_new_string (user->real_name);
     else if (strcmp (property_name, "HomeDirectory") == 0)
         return g_variant_new_string (user->home_directory);
+    else if (strcmp (property_name, "SystemAccount") == 0)
+        return g_variant_new_boolean (user->uid < 1000);
     else if (strcmp (property_name, "BackgroundFile") == 0)
         return g_variant_new_string (user->background ? user->background : "");
     else if (strcmp (property_name, "Language") == 0)
@@ -1790,6 +1792,7 @@
         "    <property name='UserName' type='s' access='read'/>"
         "    <property name='RealName' type='s' access='read'/>"
         "    <property name='HomeDirectory' type='s' access='read'/>"
+        "    <property name='SystemAccount' type='b' access='read'/>"
         "    <property name='BackgroundFile' type='s' access='read'/>"
         "    <property name='Language' type='s' access='read'/>"
         "    <property name='IconFile' type='s' access='read'/>"