From c3035afbe00bdfe90069c62efd8de8fad0297c7b Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 16 Nov 2013 12:27:15 +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 65a599aa..fadb8b1c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- polkit: only use pkexec when not already root + Version 12.43 - 13 October 2013 Colin Guthrie - tidy up polkit support diff --git a/polkit/Makefile b/polkit/Makefile index 4c379cd8..b577f9e7 100644 --- a/polkit/Makefile +++ b/polkit/Makefile @@ -15,7 +15,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