From 5e239b00d6765d66c8133593d76ffc691e65a004 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 11 Jul 2008 09:50:01 +0000 Subject: [PATCH] Don't default to polkit auth when running non-root --- ChangeLog | 5 +++++ qemud/qemud.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index dd79b76ff5..56e837b5d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 11 10:48:59 BST 2008 Daniel P. Berrange + + * qemud/qemud.c: Don't default to polkit auth when running + as non-root + Fri Jul 11 10:46:59 BST 2008 Daniel P. Berrange * src/qemu_driver.c: Fix parsing of QEMU stdout looking for diff --git a/qemud/qemud.c b/qemud/qemud.c index 139d1ffc3b..30557e1172 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1926,6 +1926,14 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, tcp_port); GET_CONF_STR (conf, filename, listen_addr); +#if HAVE_POLKIT + /* Change the default back to no auth for non-root */ + if (getuid() != 0 && auth_unix_rw == REMOTE_AUTH_POLKIT) + auth_unix_rw = REMOTE_AUTH_NONE; + if (getuid() != 0 && auth_unix_ro == REMOTE_AUTH_POLKIT) + auth_unix_ro = REMOTE_AUTH_NONE; +#endif + if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0) goto free_and_fail; #if HAVE_POLKIT