|
|
07d9f9 |
From e65dbb732d4f110dd6b55b510a754cffe0472b10 Mon Sep 17 00:00:00 2001
|
|
|
07d9f9 |
From: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
07d9f9 |
Date: Mon, 6 Jun 2016 18:04:59 +0200
|
|
|
07d9f9 |
Subject: [PATCH 16/17] sasl: fix SASL GSSAPI by allowing NULL username
|
|
|
07d9f9 |
MIME-Version: 1.0
|
|
|
07d9f9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
07d9f9 |
Content-Transfer-Encoding: 8bit
|
|
|
07d9f9 |
|
|
|
07d9f9 |
SASL GSSAPI module will try to negotiate authentication based on the
|
|
|
07d9f9 |
credentials in the default credentials cache. It does not matter if
|
|
|
07d9f9 |
SPICE knows username or not as SASL negotiation will pass through the
|
|
|
07d9f9 |
discovered name from the GSSAPI module.
|
|
|
07d9f9 |
|
|
|
07d9f9 |
Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
07d9f9 |
Acked-by: Fabiano FidĂȘncio <fidencio@redhat.com>
|
|
|
07d9f9 |
(cherry picked from commit fb8e51667b9fa63497e413fb4fd484d23b772788)
|
|
|
07d9f9 |
---
|
|
|
07d9f9 |
src/spice-channel.c | 9 ++++-----
|
|
|
07d9f9 |
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
07d9f9 |
|
|
|
07d9f9 |
diff --git a/src/spice-channel.c b/src/spice-channel.c
|
|
|
07d9f9 |
index e52a6a9..fdc0e97 100644
|
|
|
07d9f9 |
--- a/src/spice-channel.c
|
|
|
07d9f9 |
+++ b/src/spice-channel.c
|
|
|
07d9f9 |
@@ -1389,11 +1389,10 @@ spice_channel_gather_sasl_credentials(SpiceChannel *channel,
|
|
|
07d9f9 |
switch (interact[ninteract].id) {
|
|
|
07d9f9 |
case SASL_CB_AUTHNAME:
|
|
|
07d9f9 |
case SASL_CB_USER:
|
|
|
07d9f9 |
- if (spice_session_get_username(c->session) == NULL)
|
|
|
07d9f9 |
- return FALSE;
|
|
|
07d9f9 |
-
|
|
|
07d9f9 |
- interact[ninteract].result = spice_session_get_username(c->session);
|
|
|
07d9f9 |
- interact[ninteract].len = strlen(interact[ninteract].result);
|
|
|
07d9f9 |
+ if (spice_session_get_username(c->session) != NULL) {
|
|
|
07d9f9 |
+ interact[ninteract].result = spice_session_get_username(c->session);
|
|
|
07d9f9 |
+ interact[ninteract].len = strlen(interact[ninteract].result);
|
|
|
07d9f9 |
+ }
|
|
|
07d9f9 |
break;
|
|
|
07d9f9 |
|
|
|
07d9f9 |
case SASL_CB_PASS:
|
|
|
07d9f9 |
--
|
|
|
07d9f9 |
2.9.0
|
|
|
07d9f9 |
|