diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-09-17 18:08:58 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-09-17 18:08:58 +0000 |
| commit | 19a5bc3f9bfbedefe7d4d76829bbf05c72fc3951 (patch) | |
| tree | ad4ffb930878cb4ae76d6ab0ac4c5eca7c3ae3f5 | |
| parent | 8be49960d68367959e1e80a5c4a0d8e1b61cd326 (diff) | |
| download | gdm-GDM2_2_20_0.tar.gz | |
Properly propegate the new atspidir to the c-file.GDM2_2_20_0
2007-09-17 Brian Cameron <brian.cameron@sun.com>
* gui/gdmcommon.c, gui/Makefile.am: Properly propegate the new
atspidir to the c-file.
svn path=/branches/gnome-2-20/; revision=5268
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gui/Makefile.am | 1 | ||||
| -rw-r--r-- | gui/gdmcommon.c | 2 |
4 files changed, 9 insertions, 6 deletions
@@ -3,6 +3,8 @@ * Release 2.20.0: * configure.ac: Updated to new release version * NEWS: Updated. + * gui/gdmcommon.c, gui/Makefile.am: Properly propegate the new + atspidir to the c-file. 2007-09-17 Brian Cameron <brian.cameron@sun.com> @@ -100,7 +102,7 @@ 2. Added "background (true | false) #IMPLIED to item ATTLIST properties 3. Added "everywhere" and "nowhere" to list of modes for the - show ATTLIST + show ATTLIST * gui/greeter/themes/happygnome-list/Makefile.am, gui/greeter/themes/happygnome-list/happygnome-list.xml: Removed an error where max-width was used as a property for a box @@ -289,9 +291,9 @@ 2007-07-11 Brian Cameron <brian.cameron@sun.com> - This fixes CVE-2007-3381 - a denial of service attack where - the user can crash the GDM daemon with a carefully crafted GDM - sockets command and cause GDM to stop managing future displays. + This fixes CVE-2007-3381 - a denial of service attack where + the user can crash the GDM daemon with a carefully crafted GDM + sockets command and cause GDM to stop managing future displays. * daemon/gdm.c, daemon/server.c, common/gdm-common.[ch], common/gdm-common-config.c, gui/gdmlogin.c, gui/gdmcommon.[ch], diff --git a/configure.ac b/configure.ac index dfc8ef52..14f4a2a4 100644 --- a/configure.ac +++ b/configure.ac @@ -950,7 +950,7 @@ if ! test -z "$with_atspi_dir"; then else ATSPI_DIR="$gdm_libexec" fi -AC_SUBST(ATSPI_DIR) +AC_SUBST(atspidir, $ATSPI_DIR) if test x$enable_secureremote != xno ; then SSHDESKTOP="ssh.desktop" diff --git a/gui/Makefile.am b/gui/Makefile.am index da02ba41..e418c780 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -15,6 +15,7 @@ DEFS = @DEFS@ \ -DLIBDIR=\"@libdir@\" \ -DLIBEXECDIR=\"@libexecdir@\" \ -DLOGDIR=\"@logdir@\" \ + -DATSPIDIR=\"@atspidir@\" \ -DPIXMAPDIR=\"@pixmapdir@\" \ -DSBINDIR=\"@sbindir@\" \ $(NULL) diff --git a/gui/gdmcommon.c b/gui/gdmcommon.c index 961618d7..ac3dc42d 100644 --- a/gui/gdmcommon.c +++ b/gui/gdmcommon.c @@ -702,7 +702,7 @@ pre_atspi_launch (void){ if (! a11y) return FALSE; - command = g_strdup (ATSPI_DIR "/at-spi-registryd"); + command = g_strdup (ATSPIDIR "/at-spi-registryd"); atspi_prog_argv = NULL; g_shell_parse_argv (command, NULL, &atspi_prog_argv, NULL); |