Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2013-11-07 17:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2013-11-04 12:46:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2013-11-07 17:37:35.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Nov 7 12:16:56 UTC 2013 - g...@opensuse.org + +- add manpage dm-tool from trunk + +------------------------------------------------------------------- +Thu Nov 7 12:07:10 UTC 2013 - g...@opensuse.org + +- update to version 1.8.5 + - Don't pass system user accounts from AccountsService to + greeters + - Fix crash if switching to greeter and it isn't installed + - Implement missing guest-wrapper functionality and enable it for + Ubuntu + - Update AppArmor scripts to work in Ubuntu 13.10 + +------------------------------------------------------------------- Old: ---- lightdm-1.8.3.tar.xz New: ---- dm-tool.1 lightdm-1.8.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.RKLVF0/_old 2013-11-07 17:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.RKLVF0/_new 2013-11-07 17:37:36.000000000 +0100 @@ -28,7 +28,7 @@ %endif Name: lightdm -Version: 1.8.3 +Version: 1.8.5 Release: 0 Summary: Lightweight, Cross-desktop Display Manager License: GPL-3.0+ @@ -37,6 +37,7 @@ Source0: https://launchpad.net/lightdm/1.8/%{version}/+download/%{name}-%{version}.tar.xz Source1: %{name}-greeter.pamd Source2: X11-displaymanagers-%{name} +Source3: dm-tool.1 Source100: %{name}-rpmlintrc # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch g...@opensuse.org -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager Patch0: lightdm-sysconfig-support.patch @@ -169,6 +170,8 @@ install -D -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter install -D -m 644 -p %{SOURCE2} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm +install -D -m 644 -p %{SOURCE3} %{buildroot}%{_mandir}/man1/dm-tool.1 + install -d %{buildroot}%{_datadir}/lightdm/greeters install -d %{buildroot}%{_datadir}/xgreeters install -d %{buildroot}%{_datadir}/lightdm/sessions @@ -220,8 +223,9 @@ %attr(750,lightdm,lightdm) %dir %{_localstatedir}/log/lightdm %attr(750,lightdm,lightdm) %dir %{_localstatedir}/lib/lightdm %ghost %attr(711,root,root) %dir %{_localstatedir}/cache/lightdm -%doc %{_mandir}/man1/lightdm.1* -%doc %{_mandir}/man1/lightdm-set-defaults.1* +%{_mandir}/man1/lightdm.1* +%{_mandir}/man1/lightdm-set-defaults.1* +%{_mandir}/man1/dm-tool.1* %files lang -f %{name}.lang ++++++ dm-tool.1 ++++++ .TH DM-TOOL 1 "7 November 2013" .SH NAME dm-tool \- a tool to control the display manager .SH SYNOPSIS .B dm-tool [ .I OPTIONS ] .I COMMAND [ .I ARGS ] .SH DESCRIPTION .B dm-tool is a tool to communicate with the LightDM display manager. .SH OPTIONS .TP .B \-h, \-\-help Show help options .TP .B \-\-version Show release version .TP .B \-\-session-bus Attempt to connect to the display manager using the session bus. This is useful if you are running a display manager in a test mode. If this option is not present dm-tool will connect using the system bus. .TP The following commands are available: .TP .B switch-to-greeter Switch to the greeter suitable for logging into a new session. .TP .B switch-to-user USERNAME [SESSION] Switch to a user session. If this user is already logged in then the display manager will switch to that session, otherwise a new session is started. If authentication is required a greeter will start to collect this. If the session option is provided then this session type will be used, otherwise the default for this user is used. .TP .B switch-to-guest [SESSION] Switch to a guest session. If the guest session is already active the display manager will switch to that session, otherwise the guest session is started. If the session option is provided then this session type will be used, otherwise the default for the guest user is used. .TP .B lock Lock the current seat. This will swith to a greeter with a hint that the screen is locked. You can return to this session by authenticating in the greeter. .TP .B list-seats List the active seats and sessions that are running. .TP .B add-nested-seat Start an X server inside a session and connect it to a display manager. .TP .B add-local-x-seat DISPLAY_NUMBER Connect an existing X server to the display manager. .TP .B add-seat TYPE [NAME=VALUE...] Add a dynamic seat. .SH SEE ALSO .BR lightdm (1), .BR lightdm-set-defaults (1) ++++++ lightdm-1.8.3.tar.xz -> lightdm-1.8.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/NEWS new/lightdm-1.8.5/NEWS --- old/lightdm-1.8.3/NEWS 2013-10-30 22:17:04.000000000 +0100 +++ new/lightdm-1.8.5/NEWS 2013-11-07 03:39:12.000000000 +0100 @@ -1,3 +1,13 @@ +Overview of changes in lightdm 1.8.5 + + * Don't pass system user accounts from AccountsService to greeters. + * Fix crash if switching to greeter and it isn't installed. + +Overview of changes in lightdm 1.8.4 + + * Implement missing guest-wrapper functionality and enable it for Ubuntu. + * Update AppArmor scripts to work in Ubuntu 13.10. + Overview of changes in lightdm 1.8.3 * Correctly set $XDG_SESSION_CLASS for greeters. This was regressed in 1.7.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/configure new/lightdm-1.8.5/configure --- old/lightdm-1.8.3/configure 2013-10-30 22:00:35.000000000 +0100 +++ new/lightdm-1.8.5/configure 2013-11-07 03:39:56.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lightdm 1.8.3. +# Generated by GNU Autoconf 2.69 for lightdm 1.8.5. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='lightdm' PACKAGE_TARNAME='lightdm' -PACKAGE_VERSION='1.8.3' -PACKAGE_STRING='lightdm 1.8.3' +PACKAGE_VERSION='1.8.5' +PACKAGE_STRING='lightdm 1.8.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1464,7 +1464,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lightdm 1.8.3 to adapt to many kinds of systems. +\`configure' configures lightdm 1.8.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1534,7 +1534,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lightdm 1.8.3:";; + short | recursive ) echo "Configuration of lightdm 1.8.5:";; esac cat <<\_ACEOF @@ -1706,7 +1706,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lightdm configure 1.8.3 +lightdm configure 1.8.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2192,7 +2192,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lightdm $as_me 1.8.3, which was +It was created by lightdm $as_me 1.8.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3058,7 +3058,7 @@ # Define the identity of the package. PACKAGE='lightdm' - VERSION='1.8.3' + VERSION='1.8.5' cat >>confdefs.h <<_ACEOF @@ -19005,7 +19005,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lightdm $as_me 1.8.3, which was +This file was extended by lightdm $as_me 1.8.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19071,7 +19071,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lightdm config.status 1.8.3 +lightdm config.status 1.8.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/configure.ac new/lightdm-1.8.5/configure.ac --- old/lightdm-1.8.3/configure.ac 2013-10-30 22:00:21.000000000 +0100 +++ new/lightdm-1.8.5/configure.ac 2013-11-07 03:38:59.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.8.3) +AC_INIT(lightdm, 1.8.5) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/data/apparmor/abstractions/lightdm new/lightdm-1.8.5/data/apparmor/abstractions/lightdm --- old/lightdm-1.8.3/data/apparmor/abstractions/lightdm 2013-10-09 05:16:00.000000000 +0200 +++ new/lightdm-1.8.5/data/apparmor/abstractions/lightdm 2013-10-31 19:25:41.000000000 +0100 @@ -8,6 +8,10 @@ # etc). Note that this profile intentionally omits chromium-browser. #include <abstractions/authentication> + #include <abstractions/cups-client> + #include <abstractions/dbus> + #include <abstractions/dbus-session> + #include <abstractions/dbus-accessibility> #include <abstractions/nameservice> #include <abstractions/wutmp> /etc/compizconfig/config rw, # bug in compiz https://launchpad.net/bugs/697678 @@ -47,6 +51,8 @@ /sbin/** rmixk, /sys/ r, /sys/** rm, + # needed for confined trusted helpers, such as dbus-daemon + /sys/kernel/security/apparmor/.access rw, /tmp/ rw, owner /tmp/** rwlkmix, /usr/ r, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/data/lightdm.conf new/lightdm-1.8.5/data/lightdm.conf --- old/lightdm-1.8.3/data/lightdm.conf 2013-10-30 19:58:01.000000000 +0100 +++ new/lightdm-1.8.5/data/lightdm.conf 2013-10-31 19:25:41.000000000 +0100 @@ -14,7 +14,6 @@ # sessions-directory = Directory to find sessions # remote-sessions-directory = Directory to find remote sessions # greeters-directory = Directory to find greeters -# disable-guest-wrapper = Disable using guest session wrapper (temporary? required to make tests work without installing) # [LightDM] #start-default-seat=true @@ -30,7 +29,6 @@ #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions #remote-sessions-directory=/usr/share/lightdm/remote-sessions #greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters -#disable-guest-wrapper=false # # Seat defaults @@ -59,6 +57,7 @@ # guest-session = Session to load for guests (overrides user-session) # session-wrapper = Wrapper script to run session with # greeter-wrapper = Wrapper script to run greeter with +# guest-wrapper = Wrapper script to run guest sessions with # display-setup-script = Script to run when starting a greeter session (runs as root) # greeter-setup-script = Script to run when starting a greeter (runs as root) # session-setup-script = Script to run when starting a user session (runs as root) @@ -95,6 +94,7 @@ #guest-session=UNIMPLEMENTED #session-wrapper=lightdm-session #greeter-wrapper= +#guest-wrapper= #display-setup-script= #greeter-setup-script= #session-setup-script= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/liblightdm-gobject/user.c new/lightdm-1.8.5/liblightdm-gobject/user.c --- old/lightdm-1.8.3/liblightdm-gobject/user.c 2013-10-09 05:16:00.000000000 +0200 +++ new/lightdm-1.8.5/liblightdm-gobject/user.c 2013-11-07 03:02:17.000000000 +0100 @@ -385,6 +385,7 @@ GVariant *result, *value; GVariantIter *iter; gchar *name; + gboolean system_account = FALSE; GError *error = NULL; result = g_dbus_connection_call_sync (g_dbus_proxy_get_connection (object->proxy), @@ -427,6 +428,10 @@ g_variant_get (value, "&s", &home_directory); g_free (priv->home_directory); priv->home_directory = g_strdup (home_directory); + } + 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, "IconFile") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_STRING)) { @@ -453,7 +458,7 @@ g_variant_unref (result); - return TRUE; + return !system_account; } static void @@ -464,8 +469,8 @@ if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("()"))) { g_debug ("User %s changed", g_dbus_proxy_get_object_path (object->proxy)); - update_user (object); - g_signal_emit (object->user, user_signals[CHANGED], 0); + if (update_user (object)) + g_signal_emit (object->user, user_signals[CHANGED], 0); } else g_warning ("Got org.freedesktop.Accounts.User signal Changed with unknown parameters %s", g_variant_get_type_string (parameters)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/src/seat.c new/lightdm-1.8.5/src/seat.c --- old/lightdm-1.8.3/src/seat.c 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/src/seat.c 2013-11-07 03:35:29.000000000 +0100 @@ -386,7 +386,11 @@ if (!active_session || session_get_display_server (active_session) == display_server) { l_debug (seat, "Active display server stopped, starting greeter"); - seat_switch_to_greeter (seat); + if (!seat_switch_to_greeter (seat)) + { + l_debug (seat, "Stopping; failed to start a greeter"); + seat_stop (seat); + } } } @@ -665,7 +669,11 @@ else if (!IS_GREETER (session) && session == seat_get_active_session (seat)) { l_debug (seat, "Active session stopped, starting greeter"); - seat_switch_to_greeter (seat); + if (!seat_switch_to_greeter (seat)) + { + l_debug (seat, "Stopping; failed to start a greeter"); + seat_stop (seat); + } } /* Stop the display server if no-longer required */ @@ -874,10 +882,27 @@ return session; } +static void +prepend_argv (gchar ***argv, const gchar *value) +{ + gchar **old_argv, **new_argv; + gint i; + + old_argv = *argv; + new_argv = g_malloc (sizeof (gchar *) * (g_strv_length (*argv) + 2)); + new_argv[0] = g_strdup (value); + for (i = 0; old_argv[i]; i++) + new_argv[i + 1] = old_argv[i]; + new_argv[i + 1] = NULL; + + g_free (*argv); + *argv = new_argv; +} + static Session * create_guest_session (Seat *seat) { - const gchar *session_name; + const gchar *session_name, *guest_wrapper; gchar *sessions_dir, **argv; SessionConfig *session_config; Session *session; @@ -897,6 +922,15 @@ session_set_do_authenticate (session, TRUE); session_set_is_guest (session, TRUE); argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper")); + guest_wrapper = seat_get_string_property (seat, "guest-wrapper"); + if (guest_wrapper) + { + gchar *path; + path = g_find_program_in_path (guest_wrapper); + prepend_argv (&argv, path ? path : guest_wrapper); + g_free (path); + } + session_set_argv (session, argv); g_strfreev (argv); g_object_unref (session_config); @@ -916,32 +950,11 @@ return g_object_ref (session); } -static void -prepend_argv (gchar ***argv, const gchar *value) -{ - gchar **old_argv, **new_argv; - gint i; - - old_argv = *argv; - new_argv = g_malloc (sizeof (gchar *) * (g_strv_length (*argv) + 2)); - new_argv[0] = g_strdup (value); - for (i = 0; old_argv[i]; i++) - new_argv[i + 1] = old_argv[i]; - new_argv[i + 1] = NULL; - - g_free (*argv); - *argv = new_argv; -} - static gboolean greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat) { Session *session, *existing_session; - const gchar *username, *language = NULL; - SessionConfig *session_config; - User *user; - gchar *sessions_dir = NULL; - gchar **argv; + const gchar *username; DisplayServer *display_server; /* Get the session to use */ @@ -953,7 +966,54 @@ session_set_pam_service (session, AUTOLOGIN_SERVICE); } else + { + const gchar *language = NULL; + SessionConfig *session_config; + User *user; + gchar *sessions_dir = NULL; + gchar **argv; + session = greeter_get_authentication_session (greeter); + + /* Get session command to run */ + switch (type) + { + case SESSION_TYPE_LOCAL: + sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory"); + break; + case SESSION_TYPE_REMOTE: + sessions_dir = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory"); + break; + } + + /* Load user preferences */ + user = session_get_user (session); + if (user) + { + if (!session_name) + session_name = user_get_xsession (user); + language = user_get_language (user); + } + + if (!session_name) + session_name = seat_get_string_property (seat, "user-session"); + if (user) + user_set_xsession (session_get_user (session), session_name); + + session_config = find_session_config (seat, sessions_dir, session_name); + g_free (sessions_dir); + if (!session_config) + { + l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session")); + return FALSE; + } + + configure_session (session, session_config, session_name, language); + argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper")); + session_set_argv (session, argv); + g_strfreev (argv); + g_object_unref (session_config); + } /* Switch to this session when it is ready */ if (seat->priv->session_to_activate) @@ -972,45 +1032,6 @@ return TRUE; } - /* Get session command to run */ - switch (type) - { - case SESSION_TYPE_LOCAL: - sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory"); - break; - case SESSION_TYPE_REMOTE: - sessions_dir = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory"); - break; - } - - /* Load user preferences */ - user = session_get_user (session); - if (user) - { - if (!session_name) - session_name = user_get_xsession (user); - language = user_get_language (user); - } - - if (!session_name) - session_name = seat_get_string_property (seat, "user-session"); - if (user) - user_set_xsession (session_get_user (session), session_name); - - session_config = find_session_config (seat, sessions_dir, session_name); - g_free (sessions_dir); - if (!session_config) - { - l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session")); - return FALSE; - } - - configure_session (session, session_config, session_name, language); - argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper")); - session_set_argv (session, argv); - g_strfreev (argv); - g_object_unref (session_config); - /* If can re-use the display server, stop the greeter first */ display_server = session_get_display_server (SESSION (greeter)); if (can_share_display_server (seat, display_server) && @@ -1222,6 +1243,9 @@ } greeter_session = create_greeter_session (seat); + if (!greeter_session) + return FALSE; + if (seat->priv->session_to_activate) g_object_unref (seat->priv->session_to_activate); seat->priv->session_to_activate = g_object_ref (greeter_session); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/Makefile.am new/lightdm-1.8.5/tests/Makefile.am --- old/lightdm-1.8.3/tests/Makefile.am 2013-10-30 19:58:01.000000000 +0100 +++ new/lightdm-1.8.5/tests/Makefile.am 2013-11-07 03:35:29.000000000 +0100 @@ -22,6 +22,7 @@ test-autologin-guest-in-background \ test-autologin-timeout-in-background \ test-autologin-invalid-user \ + test-autologin-invalid-greeter \ test-autologin-invalid-session \ test-crash-authenticate \ test-autologin-xserver-crash \ @@ -46,6 +47,7 @@ test-autologin-guest \ test-autologin-guest-fail-setup-script \ test-autologin-guest-logout \ + test-guest-wrapper \ test-group-membership \ test-xdg-current-desktop \ test-xdg-seat \ @@ -67,6 +69,7 @@ test-no-language \ test-language-no-accounts-service \ test-login-crash-authenticate \ + test-login-invalid-greeter \ test-login-gobject \ test-login-gobject-manual \ test-login-gobject-manual-previous-session \ @@ -297,6 +300,7 @@ scripts/autologin-guest-logout.conf \ scripts/autologin-guest-timeout.conf \ scripts/autologin-in-background.conf \ + scripts/autologin-invalid-greeter.conf \ scripts/autologin-guest-in-background.conf \ scripts/autologin-timeout-in-background.conf \ scripts/autologin-invalid-session.conf \ @@ -330,6 +334,7 @@ scripts/greeter-wrapper.conf \ scripts/greeter-xserver-crash.conf \ scripts/group-membership.conf \ + scripts/guest-wrapper.conf \ scripts/headless.conf \ scripts/home-dir-on-authenticate.conf \ scripts/home-dir-on-session.conf \ @@ -352,6 +357,7 @@ scripts/login-guest-logout.conf \ scripts/login-guest-no-setup-script.conf \ scripts/login-info-prompt.conf \ + scripts/login-invalid-greeter.conf \ scripts/login-invalid-session.conf \ scripts/login-invalid-user.conf \ scripts/login-logout.conf \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/Makefile.in new/lightdm-1.8.5/tests/Makefile.in --- old/lightdm-1.8.3/tests/Makefile.in 2013-10-30 22:00:36.000000000 +0100 +++ new/lightdm-1.8.5/tests/Makefile.in 2013-11-07 03:39:57.000000000 +0100 @@ -644,10 +644,11 @@ test-autologin test-autologin-in-background \ test-autologin-guest-in-background \ test-autologin-timeout-in-background \ - test-autologin-invalid-user test-autologin-invalid-session \ - test-crash-authenticate test-autologin-xserver-crash \ - test-autologin-session-crash test-autologin-password \ - test-autologin-new-authtok test-autologin-gobject-timeout \ + test-autologin-invalid-user test-autologin-invalid-greeter \ + test-autologin-invalid-session test-crash-authenticate \ + test-autologin-xserver-crash test-autologin-session-crash \ + test-autologin-password test-autologin-new-authtok \ + test-autologin-gobject-timeout \ test-autologin-gobject-guest-timeout \ test-change-authentication test-restart-authentication \ test-gobject-cancel-authentication test-pam test-login-pam \ @@ -655,16 +656,17 @@ test-cred-unavail test-autologin-session-error \ test-autologin-logout test-autologin-previous-session \ test-autologin-guest test-autologin-guest-fail-setup-script \ - test-autologin-guest-logout test-group-membership \ - test-xdg-current-desktop test-xdg-seat test-language-env \ - test-util-path test-session-stdout test-session-stderr \ - test-session-stderr-multi-write test-session-stderr-backup \ - test-xauthority test-corrupt-xauthority test-system-xauthority \ + test-autologin-guest-logout test-guest-wrapper \ + test-group-membership test-xdg-current-desktop test-xdg-seat \ + test-language-env test-util-path test-session-stdout \ + test-session-stderr test-session-stderr-multi-write \ + test-session-stderr-backup test-xauthority \ + test-corrupt-xauthority test-system-xauthority \ test-user-renamed test-user-renamed-invalid test-users-gobject \ test-keyboard-layout test-no-keyboard-layout test-language \ test-no-language test-language-no-accounts-service \ - test-login-crash-authenticate test-login-gobject \ - test-login-gobject-manual \ + test-login-crash-authenticate test-login-invalid-greeter \ + test-login-gobject test-login-gobject-manual \ test-login-gobject-manual-previous-session \ test-login-gobject-no-password \ test-login-gobject-long-username \ @@ -769,6 +771,7 @@ scripts/autologin-guest-logout.conf \ scripts/autologin-guest-timeout.conf \ scripts/autologin-in-background.conf \ + scripts/autologin-invalid-greeter.conf \ scripts/autologin-guest-in-background.conf \ scripts/autologin-timeout-in-background.conf \ scripts/autologin-invalid-session.conf \ @@ -802,6 +805,7 @@ scripts/greeter-wrapper.conf \ scripts/greeter-xserver-crash.conf \ scripts/group-membership.conf \ + scripts/guest-wrapper.conf \ scripts/headless.conf \ scripts/home-dir-on-authenticate.conf \ scripts/home-dir-on-session.conf \ @@ -824,6 +828,7 @@ scripts/login-guest-logout.conf \ scripts/login-guest-no-setup-script.conf \ scripts/login-info-prompt.conf \ + scripts/login-invalid-greeter.conf \ scripts/login-invalid-session.conf \ scripts/login-invalid-user.conf \ scripts/login-logout.conf \ @@ -1347,6 +1352,13 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-autologin-invalid-greeter.log: test-autologin-invalid-greeter + @p='test-autologin-invalid-greeter'; \ + b='test-autologin-invalid-greeter'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-autologin-invalid-session.log: test-autologin-invalid-session @p='test-autologin-invalid-session'; \ b='test-autologin-invalid-session'; \ @@ -1515,6 +1527,13 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-guest-wrapper.log: test-guest-wrapper + @p='test-guest-wrapper'; \ + b='test-guest-wrapper'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-group-membership.log: test-group-membership @p='test-group-membership'; \ b='test-group-membership'; \ @@ -1661,6 +1680,13 @@ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-login-invalid-greeter.log: test-login-invalid-greeter + @p='test-login-invalid-greeter'; \ + b='test-login-invalid-greeter'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) test-login-gobject.log: test-login-gobject @p='test-login-gobject'; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/autologin-guest-in-background.conf new/lightdm-1.8.5/tests/scripts/autologin-guest-in-background.conf --- old/lightdm-1.8.3/tests/scripts/autologin-guest-in-background.conf 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/autologin-guest-in-background.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check automatically logs in guest while keeping a greeter up # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] autologin-guest=true autologin-in-background=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/autologin-guest-logout.conf new/lightdm-1.8.5/tests/scripts/autologin-guest-logout.conf --- old/lightdm-1.8.3/tests/scripts/autologin-guest-logout.conf 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/autologin-guest-logout.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check automatically logs in default user # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] autologin-guest=true user-session=default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/autologin-guest-timeout.conf new/lightdm-1.8.5/tests/scripts/autologin-guest-timeout.conf --- old/lightdm-1.8.3/tests/scripts/autologin-guest-timeout.conf 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/autologin-guest-timeout.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check automatically logs in default user # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] autologin-guest=true autologin-user-timeout=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/autologin-guest.conf new/lightdm-1.8.5/tests/scripts/autologin-guest.conf --- old/lightdm-1.8.3/tests/scripts/autologin-guest.conf 2013-10-30 19:58:01.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/autologin-guest.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check automatically logs in default user # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] autologin-guest=true user-session=default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/autologin-invalid-greeter.conf new/lightdm-1.8.5/tests/scripts/autologin-invalid-greeter.conf --- old/lightdm-1.8.3/tests/scripts/autologin-invalid-greeter.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/autologin-invalid-greeter.conf 2013-11-07 03:35:29.000000000 +0100 @@ -0,0 +1,30 @@ +# +# Check quits if autologin session ends and no valid greeter +# + +[SeatDefaults] +autologin-user=have-password1 +user-session=default + +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1 +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Logout session +#?*SESSION-X-0 LOGOUT + +# X server stops +#?XSERVER-0 TERMINATE SIGNAL=15 + +#?RUNNER DAEMON-EXIT STATUS=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/guest-wrapper.conf new/lightdm-1.8.5/tests/scripts/guest-wrapper.conf --- old/lightdm-1.8.3/tests/scripts/guest-wrapper.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/guest-wrapper.conf 2013-10-31 19:25:41.000000000 +0100 @@ -0,0 +1,37 @@ +# +# Check guest wrapper works +# + +[SeatDefaults] +autologin-guest=true +user-session=default +guest-wrapper=test-guest-wrapper + +#?RUNNER DAEMON-START + +# X server starts +#?XSERVER-0 START VT=7 + +# Daemon connects when X server is ready +#?*XSERVER-0 INDICATE-READY +#?XSERVER-0 INDICATE-READY +#?XSERVER-0 ACCEPT-CONNECT + +# Guest account created +#?GUEST-ACCOUNT ADD USERNAME=guest-.* + +# Greeter wrapper starts +#?GUEST-WRAPPER-X-0 START + +# Guest session starts +#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=guest-.* +#?XSERVER-0 ACCEPT-CONNECT +#?SESSION-X-0 CONNECT-XSERVER + +# Cleanup +#?*STOP-DAEMON +#?SESSION-X-0 TERMINATE SIGNAL=15 +#?XSERVER-0 TERMINATE SIGNAL=15 +#?GUEST-ACCOUNT REMOVE USERNAME=guest.* +#?RUNNER DAEMON-EXIT STATUS=0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/login-guest-logout.conf new/lightdm-1.8.5/tests/scripts/login-guest-logout.conf --- old/lightdm-1.8.3/tests/scripts/login-guest-logout.conf 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/login-guest-logout.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check automatically logs in default user # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] user-session=default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/login-guest.conf new/lightdm-1.8.5/tests/scripts/login-guest.conf --- old/lightdm-1.8.3/tests/scripts/login-guest.conf 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/login-guest.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check can login as guest (not prompted for password) # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] user-session=default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/login-invalid-greeter.conf new/lightdm-1.8.5/tests/scripts/login-invalid-greeter.conf --- old/lightdm-1.8.3/tests/scripts/login-invalid-greeter.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/login-invalid-greeter.conf 2013-11-07 03:35:29.000000000 +0100 @@ -0,0 +1,7 @@ +# +# Check fails to start if invalid greeter +# + +#?RUNNER DAEMON-START + +#?RUNNER DAEMON-EXIT STATUS=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/switch-to-guest.conf new/lightdm-1.8.5/tests/scripts/switch-to-guest.conf --- old/lightdm-1.8.3/tests/scripts/switch-to-guest.conf 2013-10-30 19:58:01.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/switch-to-guest.conf 2013-10-31 19:25:41.000000000 +0100 @@ -2,9 +2,6 @@ # Check D-Bus interface can trigger/switch to guest session # -[LightDM] -disable-guest-wrapper=true - [SeatDefaults] autologin-user=have-password1 user-session=default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/scripts/users.conf new/lightdm-1.8.5/tests/scripts/users.conf --- old/lightdm-1.8.3/tests/scripts/users.conf 2013-10-30 21:41:46.000000000 +0100 +++ new/lightdm-1.8.5/tests/scripts/users.conf 2013-11-07 02:54:46.000000000 +0100 @@ -45,6 +45,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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/src/Makefile.am new/lightdm-1.8.5/tests/src/Makefile.am --- old/lightdm-1.8.3/tests/src/Makefile.am 2013-10-30 19:58:01.000000000 +0100 +++ new/lightdm-1.8.5/tests/src/Makefile.am 2013-10-31 19:25:41.000000000 +0100 @@ -3,6 +3,7 @@ plymouth \ test-gobject-greeter \ test-greeter-wrapper \ + test-guest-wrapper \ test-mir-greeter \ test-runner \ test-script-hook \ @@ -96,6 +97,15 @@ $(GLIB_LIBS) \ $(GIO_UNIX_LIBS) +test_guest_wrapper_SOURCES = test-guest-wrapper.c status.c status.h +test_guest_wrapper_CFLAGS = \ + $(WARN_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_UNIX_CFLAGS) +test_guest_wrapper_LDADD = \ + $(GLIB_LIBS) \ + $(GIO_UNIX_LIBS) + test_gobject_greeter_SOURCES = test-gobject-greeter.c status.c status.h test_gobject_greeter_CFLAGS = \ -I$(top_srcdir)/liblightdm-gobject \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/src/Makefile.in new/lightdm-1.8.5/tests/src/Makefile.in --- old/lightdm-1.8.3/tests/src/Makefile.in 2013-10-30 22:00:36.000000000 +0100 +++ new/lightdm-1.8.5/tests/src/Makefile.in 2013-11-07 03:39:57.000000000 +0100 @@ -82,11 +82,11 @@ host_triplet = @host@ noinst_PROGRAMS = dbus-env$(EXEEXT) initctl$(EXEEXT) plymouth$(EXEEXT) \ test-gobject-greeter$(EXEEXT) test-greeter-wrapper$(EXEEXT) \ - test-mir-greeter$(EXEEXT) test-runner$(EXEEXT) \ - test-script-hook$(EXEEXT) test-session$(EXEEXT) \ - guest-account$(EXEEXT) unity-system-compositor$(EXEEXT) \ - vnc-client$(EXEEXT) X$(EXEEXT) Xvnc$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) + test-guest-wrapper$(EXEEXT) test-mir-greeter$(EXEEXT) \ + test-runner$(EXEEXT) test-script-hook$(EXEEXT) \ + test-session$(EXEEXT) guest-account$(EXEEXT) \ + unity-system-compositor$(EXEEXT) vnc-client$(EXEEXT) \ + X$(EXEEXT) Xvnc$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) @COMPILE_LIBLIGHTDM_QT4_TRUE@am__append_1 = test-qt4-greeter @COMPILE_LIBLIGHTDM_QT5_TRUE@am__append_2 = test-qt5-greeter subdir = tests/src @@ -187,6 +187,16 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(test_greeter_wrapper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +am_test_guest_wrapper_OBJECTS = \ + test_guest_wrapper-test-guest-wrapper.$(OBJEXT) \ + test_guest_wrapper-status.$(OBJEXT) +test_guest_wrapper_OBJECTS = $(am_test_guest_wrapper_OBJECTS) +test_guest_wrapper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +test_guest_wrapper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_guest_wrapper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ am_test_mir_greeter_OBJECTS = \ test_mir_greeter-test-mir-greeter.$(OBJEXT) \ test_mir_greeter-status.$(OBJEXT) @@ -325,20 +335,20 @@ SOURCES = $(libsystem_la_SOURCES) $(X_SOURCES) $(Xvnc_SOURCES) \ dbus-env.c $(guest_account_SOURCES) $(initctl_SOURCES) \ $(plymouth_SOURCES) $(test_gobject_greeter_SOURCES) \ - $(test_greeter_wrapper_SOURCES) $(test_mir_greeter_SOURCES) \ - $(test_qt4_greeter_SOURCES) $(nodist_test_qt4_greeter_SOURCES) \ - $(test_qt5_greeter_SOURCES) $(nodist_test_qt5_greeter_SOURCES) \ - $(test_runner_SOURCES) $(test_script_hook_SOURCES) \ - $(test_session_SOURCES) $(unity_system_compositor_SOURCES) \ - $(vnc_client_SOURCES) + $(test_greeter_wrapper_SOURCES) $(test_guest_wrapper_SOURCES) \ + $(test_mir_greeter_SOURCES) $(test_qt4_greeter_SOURCES) \ + $(nodist_test_qt4_greeter_SOURCES) $(test_qt5_greeter_SOURCES) \ + $(nodist_test_qt5_greeter_SOURCES) $(test_runner_SOURCES) \ + $(test_script_hook_SOURCES) $(test_session_SOURCES) \ + $(unity_system_compositor_SOURCES) $(vnc_client_SOURCES) DIST_SOURCES = $(libsystem_la_SOURCES) $(X_SOURCES) $(Xvnc_SOURCES) \ dbus-env.c $(guest_account_SOURCES) $(initctl_SOURCES) \ $(plymouth_SOURCES) $(test_gobject_greeter_SOURCES) \ - $(test_greeter_wrapper_SOURCES) $(test_mir_greeter_SOURCES) \ - $(test_qt4_greeter_SOURCES) $(test_qt5_greeter_SOURCES) \ - $(test_runner_SOURCES) $(test_script_hook_SOURCES) \ - $(test_session_SOURCES) $(unity_system_compositor_SOURCES) \ - $(vnc_client_SOURCES) + $(test_greeter_wrapper_SOURCES) $(test_guest_wrapper_SOURCES) \ + $(test_mir_greeter_SOURCES) $(test_qt4_greeter_SOURCES) \ + $(test_qt5_greeter_SOURCES) $(test_runner_SOURCES) \ + $(test_script_hook_SOURCES) $(test_session_SOURCES) \ + $(unity_system_compositor_SOURCES) $(vnc_client_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -629,6 +639,16 @@ $(GLIB_LIBS) \ $(GIO_UNIX_LIBS) +test_guest_wrapper_SOURCES = test-guest-wrapper.c status.c status.h +test_guest_wrapper_CFLAGS = \ + $(WARN_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_UNIX_CFLAGS) + +test_guest_wrapper_LDADD = \ + $(GLIB_LIBS) \ + $(GIO_UNIX_LIBS) + test_gobject_greeter_SOURCES = test-gobject-greeter.c status.c status.h test_gobject_greeter_CFLAGS = \ -I$(top_srcdir)/liblightdm-gobject \ @@ -877,6 +897,10 @@ @rm -f test-greeter-wrapper$(EXEEXT) $(AM_V_CCLD)$(test_greeter_wrapper_LINK) $(test_greeter_wrapper_OBJECTS) $(test_greeter_wrapper_LDADD) $(LIBS) +test-guest-wrapper$(EXEEXT): $(test_guest_wrapper_OBJECTS) $(test_guest_wrapper_DEPENDENCIES) $(EXTRA_test_guest_wrapper_DEPENDENCIES) + @rm -f test-guest-wrapper$(EXEEXT) + $(AM_V_CCLD)$(test_guest_wrapper_LINK) $(test_guest_wrapper_OBJECTS) $(test_guest_wrapper_LDADD) $(LIBS) + test-mir-greeter$(EXEEXT): $(test_mir_greeter_OBJECTS) $(test_mir_greeter_DEPENDENCIES) $(EXTRA_test_mir_greeter_DEPENDENCIES) @rm -f test-mir-greeter$(EXEEXT) $(AM_V_CCLD)$(test_mir_greeter_LINK) $(test_mir_greeter_OBJECTS) $(test_mir_greeter_LDADD) $(LIBS) @@ -939,6 +963,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gobject_greeter-test-gobject-greeter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_greeter_wrapper-status.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_greeter_wrapper-test-greeter-wrapper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_guest_wrapper-status.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mir_greeter-status.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mir_greeter-test-mir-greeter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_qt4_greeter-status.Po@am__quote@ @@ -1300,6 +1326,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_greeter_wrapper_CFLAGS) $(CFLAGS) -c -o test_greeter_wrapper-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi` +test_guest_wrapper-test-guest-wrapper.o: test-guest-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -MT test_guest_wrapper-test-guest-wrapper.o -MD -MP -MF $(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Tpo -c -o test_guest_wrapper-test-guest-wrapper.o `test -f 'test-guest-wrapper.c' || echo '$(srcdir)/'`test-guest-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Tpo $(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-guest-wrapper.c' object='test_guest_wrapper-test-guest-wrapper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -c -o test_guest_wrapper-test-guest-wrapper.o `test -f 'test-guest-wrapper.c' || echo '$(srcdir)/'`test-guest-wrapper.c + +test_guest_wrapper-test-guest-wrapper.obj: test-guest-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -MT test_guest_wrapper-test-guest-wrapper.obj -MD -MP -MF $(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Tpo -c -o test_guest_wrapper-test-guest-wrapper.obj `if test -f 'test-guest-wrapper.c'; then $(CYGPATH_W) 'test-guest-wrapper.c'; else $(CYGPATH_W) '$(srcdir)/test-guest-wrapper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Tpo $(DEPDIR)/test_guest_wrapper-test-guest-wrapper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-guest-wrapper.c' object='test_guest_wrapper-test-guest-wrapper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -c -o test_guest_wrapper-test-guest-wrapper.obj `if test -f 'test-guest-wrapper.c'; then $(CYGPATH_W) 'test-guest-wrapper.c'; else $(CYGPATH_W) '$(srcdir)/test-guest-wrapper.c'; fi` + +test_guest_wrapper-status.o: status.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -MT test_guest_wrapper-status.o -MD -MP -MF $(DEPDIR)/test_guest_wrapper-status.Tpo -c -o test_guest_wrapper-status.o `test -f 'status.c' || echo '$(srcdir)/'`status.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_guest_wrapper-status.Tpo $(DEPDIR)/test_guest_wrapper-status.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='status.c' object='test_guest_wrapper-status.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -c -o test_guest_wrapper-status.o `test -f 'status.c' || echo '$(srcdir)/'`status.c + +test_guest_wrapper-status.obj: status.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -MT test_guest_wrapper-status.obj -MD -MP -MF $(DEPDIR)/test_guest_wrapper-status.Tpo -c -o test_guest_wrapper-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_guest_wrapper-status.Tpo $(DEPDIR)/test_guest_wrapper-status.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='status.c' object='test_guest_wrapper-status.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_guest_wrapper_CFLAGS) $(CFLAGS) -c -o test_guest_wrapper-status.obj `if test -f 'status.c'; then $(CYGPATH_W) 'status.c'; else $(CYGPATH_W) '$(srcdir)/status.c'; fi` + test_mir_greeter-test-mir-greeter.o: test-mir-greeter.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_mir_greeter_CFLAGS) $(CFLAGS) -MT test_mir_greeter-test-mir-greeter.o -MD -MP -MF $(DEPDIR)/test_mir_greeter-test-mir-greeter.Tpo -c -o test_mir_greeter-test-mir-greeter.o `test -f 'test-mir-greeter.c' || echo '$(srcdir)/'`test-mir-greeter.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_mir_greeter-test-mir-greeter.Tpo $(DEPDIR)/test_mir_greeter-test-mir-greeter.Po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/src/test-guest-wrapper.c new/lightdm-1.8.5/tests/src/test-guest-wrapper.c --- old/lightdm-1.8.3/tests/src/test-guest-wrapper.c 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/src/test-guest-wrapper.c 2013-10-31 19:25:41.000000000 +0100 @@ -0,0 +1,29 @@ +#include <stdlib.h> +#include <unistd.h> + +#include "status.h" + +static void +request_cb (const gchar *request) +{ +} + +int +main (int argc, char **argv) +{ + gchar *display; + + status_connect (request_cb); + + display = getenv ("DISPLAY"); + if (display == NULL) + status_notify ("GUEST-WRAPPER-? START"); + else if (display[0] == ':') + status_notify ("GUEST-WRAPPER-X-%s START", display + 1); + else + status_notify ("GUEST-WRAPPER-X-%s START", display); + + execv (argv[1], argv + 1); + + return EXIT_FAILURE; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/src/test-runner.c new/lightdm-1.8.5/tests/src/test-runner.c --- old/lightdm-1.8.3/tests/src/test-runner.c 2013-10-09 05:16:00.000000000 +0200 +++ new/lightdm-1.8.5/tests/src/test-runner.c 2013-11-07 02:54:46.000000000 +0100 @@ -1577,7 +1577,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)); } @@ -1645,6 +1645,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 (""); else if (strcmp (property_name, "Language") == 0) @@ -1700,6 +1702,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='XSession' type='s' access='read'/>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/test-autologin-invalid-greeter new/lightdm-1.8.5/tests/test-autologin-invalid-greeter --- old/lightdm-1.8.3/tests/test-autologin-invalid-greeter 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/test-autologin-invalid-greeter 2013-11-07 03:35:29.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner autologin-invalid-greeter INVALID diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/test-guest-wrapper new/lightdm-1.8.5/tests/test-guest-wrapper --- old/lightdm-1.8.3/tests/test-guest-wrapper 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/test-guest-wrapper 2013-10-31 19:25:41.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner guest-wrapper test-gobject-greeter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.8.3/tests/test-login-invalid-greeter new/lightdm-1.8.5/tests/test-login-invalid-greeter --- old/lightdm-1.8.3/tests/test-login-invalid-greeter 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.8.5/tests/test-login-invalid-greeter 2013-11-07 03:35:29.000000000 +0100 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner login-invalid-greeter INVALID ++++++ lightdm-default-configuration.patch ++++++ --- /var/tmp/diff_new_pack.RKLVF0/_old 2013-11-07 17:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.RKLVF0/_new 2013-11-07 17:37:36.000000000 +0100 @@ -3,7 +3,7 @@ diff --git a/data/lightdm.conf b/data/lightdm.conf --- a/data/lightdm.conf +++ b/data/lightdm.conf -@@ -51,7 +51,7 @@ +@@ -50,7 +50,7 @@ #minimum-display-number=0 #minimum-vt=7 #lock-memory=true @@ -12,7 +12,7 @@ #guest-account-script=guest-account #log-directory=/var/log/lightdm #run-directory=/var/run/lightdm -@@ -103,6 +103,7 @@ +@@ -102,6 +102,7 @@ #type=xlocal #xdg-seat=seat0 #xserver-command=X @@ -20,13 +20,14 @@ #xserver-layout= #xserver-config= #xserver-allow-tcp=false -@@ -122,12 +123,12 @@ +@@ -121,13 +122,13 @@ #user-session=default #allow-guest=true #guest-session=UNIMPLEMENTED -#session-wrapper=lightdm-session +session-wrapper=/etc/X11/xdm/Xsession #greeter-wrapper= + #guest-wrapper= #display-setup-script= -#greeter-setup-script= -#session-setup-script= ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.RKLVF0/_old 2013-11-07 17:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.RKLVF0/_new 2013-11-07 17:37:36.000000000 +0100 @@ -632,7 +632,7 @@ diff --git a/src/seat.c b/src/seat.c --- a/src/seat.c +++ b/src/seat.c -@@ -1093,7 +1093,10 @@ create_greeter_session (Seat *seat) +@@ -1114,7 +1114,10 @@ create_greeter_session (Seat *seat) session_set_argv (SESSION (greeter_session), argv); g_strfreev (argv); @@ -644,7 +644,7 @@ g_signal_connect (greeter_session, "create-session", G_CALLBACK (greeter_create_session_cb), seat); g_signal_connect (greeter_session, "start-session", G_CALLBACK (greeter_start_session_cb), seat); -@@ -1306,7 +1309,10 @@ seat_switch_to_user (Seat *seat, const g +@@ -1330,7 +1333,10 @@ seat_switch_to_user (Seat *seat, const g /* Attempt to authenticate them */ session = create_user_session (seat, username, FALSE); g_signal_connect (session, "authentication-complete", G_CALLBACK (switch_authentication_complete_cb), seat); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
