diff options
| author | Pablo Saratxaga <pablo@mandrakesoft.com> | 2002-01-11 20:18:24 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2002-01-11 20:18:24 +0000 |
| commit | 06a2ff0ffe57fac4a1a077df301eae7abae03a7a (patch) | |
| tree | ecfa9ceded3bcdde32a35847188ab7f69efe27d2 | |
| parent | fb44889e7586089ebce14baea42e69810f2a4b90 (diff) | |
| download | gdm-06a2ff0ffe57fac4a1a077df301eae7abae03a7a.tar.gz | |
raise version
Fri Jan 11 12:44:27 2002 George Lebl <jirka@5z.com>
* configure.in: raise version
* Merge from 2.2 up to MERGE_3
2002-01-04 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure,in (ALL_LINGUAS): Added "eu".
Mon Dec 31 18:54:25 2001 George Lebl <jirka@5z.com>
* daemon/slave.c: set egid to the correct value before we do setuid
to avoid running the session with gdm group privilages. (Note
that all session files run bash and thus drop those, but this
is a problem for the failsafes)
* gui/gdmlogin.c: Make PositionX and PositionY follow the standard
X geometry behaviour where negative values mean position from
lower/right edge
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | daemon/slave.c | 4 | ||||
| -rw-r--r-- | gui/gdmconfig.glade | 4 | ||||
| -rw-r--r-- | gui/gdmlanguages.c | 4 | ||||
| -rw-r--r-- | gui/gdmlogin.c | 6 |
7 files changed, 54 insertions, 4 deletions
@@ -1,3 +1,24 @@ +Fri Jan 11 12:44:27 2002 George Lebl <jirka@5z.com> + + * configure.in: raise version + + * Merge from 2.2 up to MERGE_3 + + 2002-01-04 Pablo Saratxaga <pablo@mandrakesoft.com> + + * configure,in (ALL_LINGUAS): Added "eu". + + Mon Dec 31 18:54:25 2001 George Lebl <jirka@5z.com> + + * daemon/slave.c: set egid to the correct value before we do setuid + to avoid running the session with gdm group privilages. (Note + that all session files run bash and thus drop those, but this + is a problem for the failsafes) + + * gui/gdmlogin.c: Make PositionX and PositionY follow the standard + X geometry behaviour where negative values mean position from + lower/right edge + Thu Dec 27 16:45:04 2001 George Lebl <jirka@5z.com> * Release 2.3.90.0 @@ -1,5 +1,20 @@ Ahh news... +2.3.90.1 stuff: + +- All changes up to 2.2.5.4 + +2.2.5.4 stuff: + +- SECURITY FIX! Make sure the egid is reset to the user gid before + starting a session. This could present a security risk under a + certain circumstances, that is if your /bin/sh does not drop privilages. + It also fixes the failsafe gnome session + +- PositionX and PositionY now take negative values that work + like standard X geometries. A negative value is an offset from + the right/lower edge. + 2.3.90.0 stuff: - All changes up to 2.2.5.3 diff --git a/configure.in b/configure.in index 83a4d2c4..dbae9aed 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ dnl AC_PROG_INTLTOOL AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gdm,2.3.90.0) +AM_INIT_AUTOMAKE(gdm,2.3.90.1) AM_MAINTAINER_MODE GDK_PIXBUF_REQUIRED=1.3.1 @@ -142,7 +142,7 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) dnl ## internationalization support -ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt lv ms nl nn no pl pt_BR pt ro ru sk sl sv ta tr uk zh_CN.GB2312 zh_TW" +ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hu it ja ko lt lv ms nl nn no pl pt_BR pt ro ru sk sl sv ta tr uk zh_CN.GB2312 zh_TW" dnl AM_GNOME_GETTEXT dnl AM_GNU_GETTEXT AM_GLIB_GNU_GETTEXT diff --git a/daemon/slave.c b/daemon/slave.c index 646fe781..970e20bd 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -1886,6 +1886,10 @@ session_child_run (struct passwd *pwent, "Aborting."), "gdm_slave_session_start", login); + /* setup egid to the correct group, + * not to leave the egid around */ + setegid (pwent->pw_gid); + if (setuid (pwent->pw_uid) < 0) gdm_child_exit (DISPLAY_REMANAGE, _("gdm_slave_session_start: Could not become %s. Aborting."), login); diff --git a/gui/gdmconfig.glade b/gui/gdmconfig.glade index 46a261e7..de946b9f 100644 --- a/gui/gdmconfig.glade +++ b/gui/gdmconfig.glade @@ -1017,7 +1017,7 @@ tr_TR <snap>False</snap> <wrap>False</wrap> <value>0</value> - <lower>0</lower> + <lower>-32000</lower> <upper>32000</upper> <step>1</step> <page>10</page> @@ -1054,7 +1054,7 @@ tr_TR <snap>False</snap> <wrap>False</wrap> <value>0</value> - <lower>0</lower> + <lower>-32000</lower> <upper>32000</upper> <step>1</step> <page>10</page> diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c index 42e782b1..c6ba636d 100644 --- a/gui/gdmlanguages.c +++ b/gui/gdmlanguages.c @@ -32,6 +32,10 @@ struct _Language { int found; }; +/* Note: these should NOT include the encodings, this is just a translation + * matrix for language_country names. This is NOT a list of available + * languages, just their names and where they are placed in the menu. + * The available languages come from the supplied locale.alias */ static Language languages [] = { /*Note translate the A-M to the A-M you used in the group label */ { N_("A-M|Catalan"), "ca_ES", 0 }, diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index df3da2b2..45e5c7f6 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -289,6 +289,12 @@ set_screen_pos (GtkWidget *widget, int x, int y) g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_WIDGET (widget)); + /* allow negative values, to be like standard X geometry ones */ + if (x < 0) + x = gdm_wm_screen.width + x - widget->allocation.width; + if (y < 0) + y = gdm_wm_screen.height + y - widget->allocation.height; + if (x < gdm_wm_screen.x) x = gdm_wm_screen.x; if (y < gdm_wm_screen.y) |