48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
|
From 0aa1a9b167ca8a32d7c7112df375ddfa608f1f72 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andre Przywara <andre.przywara@amd.com>
|
||
|
|
Date: Thu, 18 Oct 2012 11:16:58 +0200
|
||
|
|
Subject: [PATCH] vnc-tls: Fix compilation with newer versions of GNU-TLS
|
||
|
|
|
||
|
|
In my installation of GNU-TLS (v3.0.23) the type
|
||
|
|
gnutls_anon_server_credentials is marked deprecated, so -Werror
|
||
|
|
breaks compilation.
|
||
|
|
Simply replacing it with the newer ..._t version fixed the compilation
|
||
|
|
on my machine (Slackware 14.0). I cannot tell how far back this "new"
|
||
|
|
type goes, at least the header file in RHEL 5.0 (v1.4.1) seems to have
|
||
|
|
it already. If someone finds a broken distribution, tell me and I
|
||
|
|
insert some compat code.
|
||
|
|
|
||
|
|
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
|
||
|
|
Message-id: 1350551818-14717-1-git-send-email-andre.przywara@amd.com
|
||
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
||
|
|
(cherry picked from commit 7d2a929feba319c18603e324b1750830d6c8b7a1)
|
||
|
|
---
|
||
|
|
ui/vnc-tls.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
|
||
|
|
index 5629263..8d4cc8e 100644
|
||
|
|
--- a/ui/vnc-tls.c
|
||
|
|
+++ b/ui/vnc-tls.c
|
||
|
|
@@ -99,9 +99,9 @@ static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
-static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
|
||
|
|
+static gnutls_anon_server_credentials_t vnc_tls_initialize_anon_cred(void)
|
||
|
|
{
|
||
|
|
- gnutls_anon_server_credentials anon_cred;
|
||
|
|
+ gnutls_anon_server_credentials_t anon_cred;
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
|
||
|
|
@@ -382,7 +382,7 @@ int vnc_tls_client_setup(struct VncState *vs,
|
||
|
|
}
|
||
|
|
|
||
|
|
} else {
|
||
|
|
- gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
|
||
|
|
+ gnutls_anon_server_credentials_t anon_cred = vnc_tls_initialize_anon_cred();
|
||
|
|
if (!anon_cred) {
|
||
|
|
gnutls_deinit(vs->tls.session);
|
||
|
|
vs->tls.session = NULL;
|