|
 |
1efd99 |
From af43e091e4eb48ba27dd76f84a84874e96658b3c Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: "Eduardo Lima (Etrunko)" <etrunko@redhat.com>
|
|
|
1efd99 |
Date: Fri, 27 Jan 2017 17:48:11 -0200
|
|
|
1efd99 |
Subject: [PATCH 17/26] session-spice: Pass hostname to authentication dialog
|
|
|
1efd99 |
|
|
|
1efd99 |
With this patch the dialog now shows the host we are connecting to.
|
|
|
1efd99 |
|
|
|
1efd99 |
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/virt-viewer-session-spice.c | 7 +++++--
|
|
|
1efd99 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
|
|
|
1efd99 |
index c3fce48..9b52ec0 100644
|
|
|
1efd99 |
--- a/src/virt-viewer-session-spice.c
|
|
|
1efd99 |
+++ b/src/virt-viewer-session-spice.c
|
|
|
1efd99 |
@@ -691,6 +691,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel,
|
|
|
1efd99 |
case SPICE_CHANNEL_ERROR_AUTH:
|
|
|
1efd99 |
{
|
|
|
1efd99 |
const GError *error = NULL;
|
|
|
1efd99 |
+ gchar *host = NULL;
|
|
|
1efd99 |
g_debug("main channel: auth failure (wrong username/password?)");
|
|
|
1efd99 |
|
|
|
1efd99 |
{
|
|
|
1efd99 |
@@ -717,11 +718,13 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel,
|
|
|
1efd99 |
user = g_strdup(g_get_user_name());
|
|
|
1efd99 |
}
|
|
|
1efd99 |
|
|
|
1efd99 |
+ g_object_get(self->priv->session, "host", &host, NULL);
|
|
|
1efd99 |
ret = virt_viewer_auth_collect_credentials(self->priv->main_window,
|
|
|
1efd99 |
"SPICE",
|
|
|
1efd99 |
- NULL,
|
|
|
1efd99 |
+ host,
|
|
|
1efd99 |
username_required ? &user : NULL,
|
|
|
1efd99 |
&password);
|
|
|
1efd99 |
+ g_free(host);
|
|
|
1efd99 |
if (!ret) {
|
|
|
1efd99 |
g_signal_emit_by_name(session, "session-cancelled");
|
|
|
1efd99 |
} else {
|
|
|
1efd99 |
@@ -750,7 +753,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel,
|
|
|
1efd99 |
g_warn_if_fail(proxy != NULL);
|
|
|
1efd99 |
|
|
|
1efd99 |
ret = virt_viewer_auth_collect_credentials(self->priv->main_window,
|
|
|
1efd99 |
- "proxy", NULL,
|
|
|
1efd99 |
+ "proxy", spice_uri_get_hostname(proxy),
|
|
|
1efd99 |
&user, &password);
|
|
|
1efd99 |
if (!ret) {
|
|
|
1efd99 |
g_signal_emit_by_name(session, "session-cancelled");
|
|
|
1efd99 |
--
|
|
|
1efd99 |
2.12.0
|
|
|
1efd99 |
|