PolicyKit: Branch 'master'

[David Zeuthen]

 src/programs/pkexec.c |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 01cee08d61c130918aca3c67b0d172b40aa9d10e
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Jul 27 10:03:34 2009 -0400

    Don't spawn man(1) from a setuid program

diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
index 10329dd..5121d21 100644
--- a/src/programs/pkexec.c
+++ b/src/programs/pkexec.c
@@ -37,18 +37,11 @@
 static void
 usage (int argc, char *argv[])
 {
-  GError *error;
-
-  error = NULL;
-  if (!g_spawn_command_line_sync ("man pkexec",
-                                  NULL,
-                                  NULL,
-                                  NULL,
-                                  &error))
-    {
-      g_printerr ("Cannot show manual page: %s\n", error->message);
-      g_error_free (error);
-    }
+  g_printerr ("pkexec --version |\n"
+              "       --help |\n"
+              "       [--user username] PROGRAM [ARGUMENTS...]\n"
+              "\n"
+              "See the pkexec manual page for more details.\n");
 }
 
 /* ---------------------------------------------------------------------------------------------------- */