xorg-server: Changes to 'debian-unstable'
debian/changelog | 7 ++
debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff | 35 ++++++++++
debian/patches/series | 1
3 files changed, 43 insertions(+)
New commits:
commit 5fc92cad34132b018c7ef120fbe91a3946dc9267
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Jan 17 20:33:10 2008 +0100
Apply grab fix for password authentication bypass
diff --git a/debian/changelog b/debian/changelog
index c428455..d724733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.4.1~git20080105-3) UNRELEASED; urgency=low
+
+ * Add 42_dont_break_grab_and_focus_for_window_when_redirecting.diff
+ to prevent password authentication bypass, closes: #449108.
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 17 Jan 2008 20:24:54 +0100
+
xorg-server (2:1.4.1~git20080105-2) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff b/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff
new file mode 100644
index 0000000..38a7725
--- /dev/null
+++ b/debian/patches/42_dont_break_grab_and_focus_for_window_when_redirecting.diff
@@ -0,0 +1,35 @@
+commit a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Wed Jan 16 20:24:11 2008 -0500
+
+ Don't break grab and focus state for a window when redirecting it.
+
+ Composite uses an unmap/map cycle to trigger backing pixmap allocation
+ and cliprect recomputation when a window is redirected or unredirected.
+ To avoid protocol visible side effects, map and unmap events are
+ disabled temporarily. However, when a window is unmapped it is also
+ removed from grabs and loses focus, but these state changes are not
+ disabled.
+
+ This change supresses the unmap side effects during the composite
+ unmap/map cycle and fixes this bug:
+
+ http://bugzilla.gnome.org/show_bug.cgi?id=488264
+
+ where compiz would cause gnome-screensaver to lose its grab when
+ compiz unredirects the fullscreen lock window.
+
+diff --git a/dix/window.c b/dix/window.c
+index 33cf76b..1ccf126 100644
+--- a/dix/window.c
++++ b/dix/window.c
+@@ -2993,7 +2993,8 @@ UnrealizeTree(
+ }
+ #endif
+ (* Unrealize)(pChild);
+- DeleteWindowFromAnyEvents(pChild, FALSE);
++ if (MapUnmapEventsEnabled(pWin))
++ DeleteWindowFromAnyEvents(pChild, FALSE);
+ if (pChild->viewable)
+ {
+ #ifdef DO_SAVE_UNDERS
diff --git a/debian/patches/series b/debian/patches/series
index baafbbe..3668873 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,7 @@
21_glx_align_fixes.patch
40_default_dpi_96.patch
41_vbe_filter_less.diff
+42_dont_break_grab_and_focus_for_window_when_redirecting.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
44_preferredmode_infinite_loop.diff
#47_fbdevhw_magic_numbers.diff
Reply to: