aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-16 12:33:13 +0100
committerColin Guthrie <colin@mageia.org>2013-11-17 11:27:16 +0000
commitc5d4799bb0bfa2a1a6eab54d9facde61430a4fbd (patch)
tree7285f1b0c8411a18704909f80ef2847f23dac238
parent849e333102777c1617610b6be650770c4cb9e6de (diff)
downloaduserdrake-c5d4799bb0bfa2a1a6eab54d9facde61430a4fbd.tar
userdrake-c5d4799bb0bfa2a1a6eab54d9facde61430a4fbd.tar.gz
userdrake-c5d4799bb0bfa2a1a6eab54d9facde61430a4fbd.tar.bz2
userdrake-c5d4799bb0bfa2a1a6eab54d9facde61430a4fbd.tar.xz
userdrake-c5d4799bb0bfa2a1a6eab54d9facde61430a4fbd.zip
polkit: Only use pkexec when not already root
-rw-r--r--NEWS2
-rw-r--r--polkit/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c57cad8..272b9cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- polkit: only use pkexec when not already root
+
Version 1.15 - 12 October 2013, Colin Guthrie
- use polkit for authorisation (mga#11125)
diff --git a/polkit/Makefile b/polkit/Makefile
index a8b5a51..070f421 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -13,7 +13,7 @@ clean:
rm -f $(WRAPPERS) $(POLICY)
%: org.mageia.%.policy.in
- @echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@
+ @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