aboutsummaryrefslogtreecommitdiffstats
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
commit33b0066a1e912425c7d69f831077d27fa3129082 (patch)
treefec72edfbccf6df9ac74be3a86a6d6d538afd987
parent580dd52f57b3d3c680a16f5292b1e860dbad6e99 (diff)
downloaduserdrake-33b0066a1e912425c7d69f831077d27fa3129082.tar
userdrake-33b0066a1e912425c7d69f831077d27fa3129082.tar.gz
userdrake-33b0066a1e912425c7d69f831077d27fa3129082.tar.bz2
userdrake-33b0066a1e912425c7d69f831077d27fa3129082.tar.xz
userdrake-33b0066a1e912425c7d69f831077d27fa3129082.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 4d07268..b60e248 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 2.3 - 16 December 2013
- fix crashing when displaying about dialog
diff --git a/polkit/Makefile b/polkit/Makefile
index 070f421..11591dd 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