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
commit97f71b4dedbea63f0309c9cbf537e63002142855 (patch)
tree6cf5b1689a94b4d873c7b46a4cd4846ca1881abe
parent60ea73c5223e06e91923ec14e4d08e9e2facefea (diff)
downloaddrak3d-97f71b4dedbea63f0309c9cbf537e63002142855.tar
drak3d-97f71b4dedbea63f0309c9cbf537e63002142855.tar.gz
drak3d-97f71b4dedbea63f0309c9cbf537e63002142855.tar.bz2
drak3d-97f71b4dedbea63f0309c9cbf537e63002142855.tar.xz
drak3d-97f71b4dedbea63f0309c9cbf537e63002142855.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 4002f5a..2b6b2cf 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
+
2.0
- switch to gtk3
- updated translations
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