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
commitb5c5b3e9c21edeb407ae4060d1ec54b9f542faa3 (patch)
tree42b0e1f8b230dbcc0c3be5e1dc8563621f0d4d2f
parentbf0f8c55fdb94747696f4c6ea4557086be6e66e9 (diff)
downloadcontrol-center-b5c5b3e9c21edeb407ae4060d1ec54b9f542faa3.tar
control-center-b5c5b3e9c21edeb407ae4060d1ec54b9f542faa3.tar.gz
control-center-b5c5b3e9c21edeb407ae4060d1ec54b9f542faa3.tar.bz2
control-center-b5c5b3e9c21edeb407ae4060d1ec54b9f542faa3.tar.xz
control-center-b5c5b3e9c21edeb407ae4060d1ec54b9f542faa3.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 5c8f221d..9ff8c3a4 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 12.50 - 8 January 2014, Thierry Vignaud
- better fix for segfault on startup (mga#10289)
diff --git a/polkit/Makefile b/polkit/Makefile
index b577f9e7..2b27470e 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -15,7 +15,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