From 741f0043788cdc95b1c7da83947a48ea74550245 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 16 Dec 2012 17:59:08 -0500 Subject: [PATCH] daemon: Preface polkit error output with 'polkit:' There's been a few bugs about an expected error from polkit: https://bugzilla.redhat.com/show_bug.cgi?id=873799 https://bugzilla.redhat.com/show_bug.cgi?id=872166 The error is: Authorization requires authentication but no agent is available. The error means that polkit needs a password, but there is no polkit agent registered in your session. Polkit agents are the bit of UI that pop up and actually ask for your password. Preface the error with the string 'polkit:' so folks can hopefully make more sense of it. (cherry picked from commit 96a108c99398f56970a29c8bfb7da9df90d206ed) --- daemon/remote.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index e7fe128a6f..35411f150f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2862,9 +2862,10 @@ error: if (authdismissed) { virReportError(VIR_ERR_AUTH_CANCELLED, "%s", _("authentication cancelled by user")); + } else if (pkout && *pkout) { + virReportError(VIR_ERR_AUTH_FAILED, _("polkit: %s"), pkout); } else { - virReportError(VIR_ERR_AUTH_FAILED, "%s", - pkout && *pkout ? pkout : _("authentication failed")); + virReportError(VIR_ERR_AUTH_FAILED, "%s", _("authentication failed")); } VIR_FREE(pkout); -- GitLab