From c5d4799bb0bfa2a1a6eab54d9facde61430a4fbd Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 16 Nov 2013 12:33:13 +0100
Subject: polkit: Only use pkexec when not already root

---
 NEWS            | 2 ++
 polkit/Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.1