aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-12 09:03:55 +0100
committerColin Guthrie <colin@mageia.org>2013-11-12 09:05:35 +0100
commit3c5ec869befbb44ce34005002f359ff98e51b125 (patch)
tree435c89bd7a14d24f190dced5bde0bde07db9c082
parent3316df6b51511095ee2e9c8acb09ae5990eedacc (diff)
downloadrpmdrake-3c5ec869befbb44ce34005002f359ff98e51b125.tar
rpmdrake-3c5ec869befbb44ce34005002f359ff98e51b125.tar.gz
rpmdrake-3c5ec869befbb44ce34005002f359ff98e51b125.tar.bz2
rpmdrake-3c5ec869befbb44ce34005002f359ff98e51b125.tar.xz
rpmdrake-3c5ec869befbb44ce34005002f359ff98e51b125.zip
polkit: Ensure wrapper uses "$@" for argument passthrough.
This ensures that arguments containing spaces etc are properly quoted Thanks to Dave Hodgins for pointing out out (twice - I forgot the first time)
-rw-r--r--NEWS16
-rw-r--r--polkit/Makefile2
2 files changed, 10 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 6eb99726..f8dc2b90 100644
--- a/NEWS
+++ b/NEWS
@@ -1,27 +1,29 @@
+- polkit: use "$@" when passing arguments in wrappers to ensure proper quoting
+
Version 5.53 - 11 November 2013, Colin Guthrie
-- fix $* escaping in polkit Makefile
+- polkit: fix $* escaping in polkit Makefile
Version 5.52.2 - 11 November 2013, Thomas Backlund
-- properly escape $$UID
-- use $$UID instead of $$(id -u)
+- polkit: properly escape $$UID
+- polkit: use $$UID instead of $$(id -u)
Version 5.52.1 - 9 November 2013, Thomas Backlund
-- fix typo in last polkit Makefile change
+- polkit: fix typo in last polkit Makefile change
Version 5.52 - 9 November 2013, Thomas Backlund
-- use /usr/libexec/drakrpm-addmedia directly under stage2
+- polkit: use /usr/libexec/drakrpm-addmedia directly under stage2
Version 5.51 - 13 October 2013, Colin Guthrie
-- tidy up polkit support
+- polkit: tidy up polkit support
Version 5.50 - 3 September 2013, Colin Guthrie
-- use polkit for authorisation (mga#11125)
+- polkit: use polkit for authorisation (mga#11125)
Version 5.49 - 9 May 2013, Thomas Backlund
diff --git a/polkit/Makefile b/polkit/Makefile
index 8ca18093..dc7c4ba4 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 exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@
%.policy: %.policy.in
intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache