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
commit5d2b909dcdbfd7c44931b153d4e9ea94916e31b1 (patch)
tree61647ccc13596f3a5704ccf3a4e93ec4e06337a7
parente8215985e65b8a600ad93e02bba2477f2030f281 (diff)
downloadmgaonline-5d2b909dcdbfd7c44931b153d4e9ea94916e31b1.tar
mgaonline-5d2b909dcdbfd7c44931b153d4e9ea94916e31b1.tar.gz
mgaonline-5d2b909dcdbfd7c44931b153d4e9ea94916e31b1.tar.bz2
mgaonline-5d2b909dcdbfd7c44931b153d4e9ea94916e31b1.tar.xz
mgaonline-5d2b909dcdbfd7c44931b153d4e9ea94916e31b1.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--NEWS3
-rw-r--r--polkit/Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 66d3c32a..fd6975ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- do not exec pkexec but run it so it has a parent process to fix double fork
+ issues mga#11184 mga#12364
+
Version 3.8 - 22 January 2014, Thierry Vignaud
- block CHLD signals on startup in order to prevent glib-threading segfaults
diff --git a/polkit/Makefile b/polkit/Makefile
index 070f4211..11591ddc 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