return NULL;
}
+static gboolean
+stop_loop (gpointer user_data)
+{
+ g_main_loop_quit ((GMainLoop *)user_data);
+ return G_SOURCE_REMOVE;
+}
+
static void
handle_command (const gchar *command)
{
if (strcmp (name, "WAIT") == 0)
{
- sleep (1);
+ /* Use a main loop so that our DBus functions are still responsive */
+ GMainLoop *loop = g_main_loop_new (NULL, FALSE);
+ g_timeout_add_seconds (1, stop_loop, loop);
+ g_main_loop_run (loop);
+ g_main_loop_unref (loop);
+ }
+ else if (strcmp (name, "LIST-SHARED-DATA-DIRS") == 0)
+ {
+ gchar *shared_dir;
+ GDir *dir;
+ const gchar *path;
+ GList *paths = NULL, *link;
+ GString *status;
+
+ shared_dir = g_strdup_printf ("%s/var/lib/lightdm-data", temp_dir);
+ dir = g_dir_open (shared_dir, 0, NULL);
+ while ((path = g_dir_read_name (dir)))
+ {
+ gchar *full_path = g_build_filename (shared_dir, path, NULL);
+ paths = g_list_insert_sorted (paths, full_path, (GCompareFunc)g_strcmp0);
+ }
+ g_dir_close (dir);
+ g_free (shared_dir);
+
+ status = g_string_new ("RUNNER LIST-SHARED-DATA-DIRS DIRS=");
+ for (link = paths; link; link = link->next)
+ {
+ path = (const gchar *)link->data;
+ GStatBuf buf;
+ if (g_stat (path, &buf) != 0)
+ continue;
+
+ if (link != paths)
+ g_string_append (status, ",");
+ gchar *basename = g_path_get_basename (path);
+ g_string_append_printf (status, "%s:%u:%u:0%o", basename,
+ buf.st_uid, buf.st_gid,
+ buf.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO));
+ g_free (basename);
+ }
+ g_list_free_full (paths, g_free);
+
+ check_status (status->str);
+ g_string_free (status, TRUE);
}
else if (strcmp (name, "LIST-SEATS") == 0)
{
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));
}
load_passwd_file ();
user = get_accounts_user_by_name (user_name);
- if (user && !user->hidden)
+ if (user)
+ {
+ if (user->hidden)
+ accounts_user_set_hidden (user, FALSE, TRUE);
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", user->path));
+ }
else
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such user: %s", user_name);
}
user->xsession = g_strdup (xsession);
g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+
+ /* And notify others that it took */
+ g_dbus_connection_emit_signal (accounts_connection,
+ NULL,
+ user->path,
+ "org.freedesktop.Accounts.User",
+ "Changed",
+ g_variant_new ("()"),
+ NULL);
}
else
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
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)
return g_variant_new_string (user->language ? user->language : "");
else if (strcmp (property_name, "IconFile") == 0)
return g_variant_new_string (user->image ? user->image : "");
+ else if (strcmp (property_name, "Shell") == 0)
+ return g_variant_new_string ("/bin/sh");
+ else if (strcmp (property_name, "Uid") == 0)
+ return g_variant_new_uint64 (user->uid);
else if (strcmp (property_name, "XSession") == 0)
return g_variant_new_string (user->xsession ? user->xsession : "");
else if (strcmp (property_name, "XKeyboardLayouts") == 0)
" <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'/>"
+ " <property name='Shell' type='s' access='read'/>"
+ " <property name='Uid' type='t' access='read'/>"
" <property name='XSession' type='s' access='read'/>"
" <property name='XKeyboardLayouts' type='as' access='read'/>"
" <property name='XHasMessages' type='b' access='read'/>"
g_mkdir_with_parents (g_strdup_printf ("%s/usr/share/lightdm/remote-sessions", temp_dir), 0755);
g_mkdir_with_parents (g_strdup_printf ("%s/usr/share/lightdm/greeters", temp_dir), 0755);
g_mkdir_with_parents (g_strdup_printf ("%s/tmp", temp_dir), 0755);
+ g_mkdir_with_parents (g_strdup_printf ("%s/var/lib/lightdm-data", temp_dir), 0755);
g_mkdir_with_parents (g_strdup_printf ("%s/var/run", temp_dir), 0755);
g_mkdir_with_parents (g_strdup_printf ("%s/var/log", temp_dir), 0755);
g_strfreev (files);
}
+ if (g_key_file_has_key (config, "test-runner-config", "shared-data-dirs", NULL))
+ {
+ gchar *dir_string;
+ gchar **dirs;
+ gint i;
+
+ dir_string = g_key_file_get_string (config, "test-runner-config", "shared-data-dirs", NULL);
+ dirs = g_strsplit (dir_string, " ", -1);
+ g_free (dir_string);
+
+ for (i = 0; dirs[i]; i++)
+ {
+ gchar **fields = g_strsplit (dirs[i], ":", -1);
+ if (g_strv_length (fields) == 4)
+ {
+ gchar *path = g_strdup_printf ("%s/var/lib/lightdm-data/%s", temp_dir, fields[0]);
+ int uid = g_ascii_strtoll (fields[1], NULL, 10);
+ int gid = g_ascii_strtoll (fields[2], NULL, 10);
+ int mode = g_ascii_strtoll (fields[3], NULL, 8);
+ g_mkdir (path, mode);
+ g_chmod (path, mode); /* mkdir filters by umask, so make sure we have what we want */
+ if (chown (path, uid, gid) < 0)
+ g_warning ("chown (%s) failed: %s", path, strerror (errno));
+ g_free (path);
+ }
+ g_strfreev (fields);
+ }
+
+ g_strfreev (dirs);
+ }
+
/* Always copy the script */
if (system (g_strdup_printf ("cp %s %s/script", config_path, temp_dir)))
perror ("Failed to copy configuration");
projects / sojka / lightdm.git / blobdiff