aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-01-22 23:00:31 +0000
committerColin Guthrie <colin@mageia.org>2014-01-22 23:20:06 +0000
commit9546268bf1c85d5ddef8204bdfb7e40f55f8b9e3 (patch)
tree0a3f9b012e132764411144824627a94b7b3201bc
parent7ed97acbae067516f950b14bc593de716eece8ba (diff)
downloadrpmdrake-9546268bf1c85d5ddef8204bdfb7e40f55f8b9e3.tar
rpmdrake-9546268bf1c85d5ddef8204bdfb7e40f55f8b9e3.tar.gz
rpmdrake-9546268bf1c85d5ddef8204bdfb7e40f55f8b9e3.tar.bz2
rpmdrake-9546268bf1c85d5ddef8204bdfb7e40f55f8b9e3.tar.xz
rpmdrake-9546268bf1c85d5ddef8204bdfb7e40f55f8b9e3.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 d1c158c9..f228b6d3 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 6.9 - 16 January 2014, Thierry Vignaud
- MageiaUpdate:
diff --git a/polkit/Makefile b/polkit/Makefile
index dc7c4ba4..158cc61b 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