summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-01-22 23:00:32 +0000
committerColin Guthrie <colin@mageia.org>2014-01-22 23:20:06 +0000
commit86df91fdd1bae8c5c055de70060902094dc09ba0 (patch)
treef63d18a59b6d730899f9f959ee9ff7767d7ea40a
parentb616556091625243e85aefdbbeb579904e74e832 (diff)
downloaddrakx-kbd-mouse-x11-86df91fdd1bae8c5c055de70060902094dc09ba0.tar
drakx-kbd-mouse-x11-86df91fdd1bae8c5c055de70060902094dc09ba0.tar.gz
drakx-kbd-mouse-x11-86df91fdd1bae8c5c055de70060902094dc09ba0.tar.bz2
drakx-kbd-mouse-x11-86df91fdd1bae8c5c055de70060902094dc09ba0.tar.xz
drakx-kbd-mouse-x11-86df91fdd1bae8c5c055de70060902094dc09ba0.zip
Do not exec pkexec but run it so it has a parent process to fix double fork issues mga#11184 mga#12364
-rw-r--r--NEWS2
-rw-r--r--polkit/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 85c4fa7..9595173 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- do not exec pkexec but run it so it has a parent process to fix double fork
+ issues mga#11184 mga#12364
- gpm now is managed in systemd and it does not use a lock file
anymore (use of systemctl instead of service)
diff --git a/polkit/Makefile b/polkit/Makefile
index dc7c4ba..158cc61 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -13,7 +13,7 @@ clean:
rm -f $(WRAPPERS) $(POLICY)
%: org.mageia.%.policy.in
- @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@
+ @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\n exit $$''?\nfi\nexec $(LIBEXECDIR)/$@ "$$''@"\n' > $@
%.policy: %.policy.in
intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache