xorg: Changes to 'debian-unstable'
debian/changelog | 4 +++-
debian/local/xserver-wrapper.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit ccb9da383be42f87a29e8694d846f839ac05925a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jun 14 23:34:42 2007 +0200
drop privileges on alternate config file given with -xf86config
diff --git a/debian/changelog b/debian/changelog
index 75ca1a6..e0c741a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
* Remove the reference to the unexisting example file
/usr/share/doc/x11-common/examples/xsession in Xsession.5.
Thanks Braun Gabor (closes: #393233).
+ * xserver-wrapper.c: drop privileges on alternate config file given
+ with -xf86config as we do for -config, closes: #323107.
[ Julien Cristau ]
* xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
@@ -11,7 +13,7 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
the obsolete -modesetting drivers on other architectures, and prefer
-intel to -i810.
- -- Julien Cristau <jcristau@debian.org> Thu, 14 Jun 2007 10:22:22 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 14 Jun 2007 23:34:24 +0200
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index b621189..967dd67 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -323,7 +323,7 @@ main(int argc, char **argv)
}
for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-config")) {
+ if (!strcmp(argv[i], "-config" || !strcmp(argv[i], "-xf86config")) {
if (setuid(getuid())) {
perror("X unable to drop setuid privileges for alternate config");
exit(1);
Reply to: