|
 |
d1efb8 |
From 9fc84302bb18ffb552f2405df7820df9c4bfa2ec Mon Sep 17 00:00:00 2001
|
|
|
d1efb8 |
From: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
d1efb8 |
Date: Wed, 9 Jan 2019 14:01:22 +0100
|
|
|
d1efb8 |
Subject: [PATCH] sasl: Factor common code auth failure
|
|
|
d1efb8 |
|
|
|
d1efb8 |
The new vnc_connection_auth_failure() method will be reused in the
|
|
|
d1efb8 |
next commit.
|
|
|
d1efb8 |
|
|
|
d1efb8 |
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
|
|
|
d1efb8 |
(cherry picked from commit 83cac0cbe8b8006c50d177650459aaa47f1fd129)
|
|
|
d1efb8 |
Resolves: rhbz#1688275
|
|
|
d1efb8 |
---
|
|
|
d1efb8 |
src/vncconnection.c | 17 +++++++++++------
|
|
|
d1efb8 |
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
d1efb8 |
|
|
|
d1efb8 |
diff --git a/src/vncconnection.c b/src/vncconnection.c
|
|
|
d1efb8 |
index afc1418..58455df 100644
|
|
|
d1efb8 |
--- a/src/vncconnection.c
|
|
|
d1efb8 |
+++ b/src/vncconnection.c
|
|
|
d1efb8 |
@@ -124,6 +124,7 @@ static void vnc_connection_close(VncConnection *conn);
|
|
|
d1efb8 |
static void vnc_connection_set_error(VncConnection *conn,
|
|
|
d1efb8 |
const char *format,
|
|
|
d1efb8 |
...) G_GNUC_PRINTF(2, 3);
|
|
|
d1efb8 |
+static void vnc_connection_auth_failure(VncConnection *conn, const char *reason);
|
|
|
d1efb8 |
|
|
|
d1efb8 |
/*
|
|
|
d1efb8 |
* A special GSource impl which allows us to wait on a certain
|
|
|
d1efb8 |
@@ -660,6 +661,14 @@ static G_GNUC_PRINTF(2, 3) void vnc_connection_set_error(VncConnection *conn,
|
|
|
d1efb8 |
vnc_connection_emit_main_context(conn, VNC_ERROR, &s);
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
|
|
|
d1efb8 |
+static void vnc_connection_auth_failure(VncConnection *conn,
|
|
|
d1efb8 |
+ const char *reason)
|
|
|
d1efb8 |
+{
|
|
|
d1efb8 |
+ struct signal_data sigdata;
|
|
|
d1efb8 |
+
|
|
|
d1efb8 |
+ sigdata.params.authReason = reason;
|
|
|
d1efb8 |
+ vnc_connection_emit_main_context(conn, VNC_AUTH_FAILURE, &sigdata);
|
|
|
d1efb8 |
+}
|
|
|
d1efb8 |
|
|
|
d1efb8 |
static gboolean vnc_connection_use_compression(VncConnection *conn)
|
|
|
d1efb8 |
{
|
|
|
d1efb8 |
@@ -3571,18 +3580,14 @@ static gboolean vnc_connection_check_auth_result(VncConnection *conn)
|
|
|
d1efb8 |
reason[len] = '\0';
|
|
|
d1efb8 |
VNC_DEBUG("Fail %s", reason);
|
|
|
d1efb8 |
if (!priv->coroutine_stop) {
|
|
|
d1efb8 |
- struct signal_data sigdata;
|
|
|
d1efb8 |
- sigdata.params.authReason = reason;
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", reason);
|
|
|
d1efb8 |
- vnc_connection_emit_main_context(conn, VNC_AUTH_FAILURE, &sigdata);
|
|
|
d1efb8 |
+ vnc_connection_auth_failure(conn, reason);
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
} else {
|
|
|
d1efb8 |
VNC_DEBUG("Fail auth no result");
|
|
|
d1efb8 |
if (!priv->coroutine_stop) {
|
|
|
d1efb8 |
- struct signal_data sigdata;
|
|
|
d1efb8 |
- sigdata.params.authReason = "Unknown authentication failure";
|
|
|
d1efb8 |
vnc_connection_set_error(conn, "%s", "Unknown authentication failure");
|
|
|
d1efb8 |
- vnc_connection_emit_main_context(conn, VNC_AUTH_FAILURE, &sigdata);
|
|
|
d1efb8 |
+ vnc_connection_auth_failure(conn, "Unknown authentication failure");
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
}
|
|
|
d1efb8 |
return FALSE;
|