Alon Levy 408bdb5
From ad2bca6903af3d02737b893679396343cd598a3e Mon Sep 17 00:00:00 2001
Alon Levy 408bdb5
From: Alon Levy <alevy@redhat.com>
Alon Levy 408bdb5
Date: Wed, 22 May 2013 19:22:26 -0400
Alon Levy 408bdb5
Subject: [PATCH 200/246] ui/vnc-tls.c: fix gnutls warning
Alon Levy 408bdb5
Alon Levy 408bdb5
---
Alon Levy 408bdb5
 ui/vnc-tls.c | 13 +++++++++++--
Alon Levy 408bdb5
 1 file changed, 11 insertions(+), 2 deletions(-)
Alon Levy 408bdb5
Alon Levy 408bdb5
diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
Alon Levy 408bdb5
index 5629263..2d01982 100644
Alon Levy 408bdb5
--- a/ui/vnc-tls.c
Alon Levy 408bdb5
+++ b/ui/vnc-tls.c
Alon Levy 408bdb5
@@ -99,9 +99,13 @@ static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
Alon Levy 408bdb5
 }
Alon Levy 408bdb5
 
Alon Levy 408bdb5
 
Alon Levy 408bdb5
-static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
Alon Levy 408bdb5
+static gnutls_anon_server_credentials_t vnc_tls_initialize_anon_cred(void)
Alon Levy 408bdb5
 {
Alon Levy 408bdb5
+#if GNUTLS_VERSION_MAJOR < 3
Alon Levy 408bdb5
     gnutls_anon_server_credentials anon_cred;
Alon Levy 408bdb5
+#else
Alon Levy 408bdb5
+    gnutls_anon_server_credentials_t anon_cred;
Alon Levy 408bdb5
+#endif
Alon Levy 408bdb5
     int ret;
Alon Levy 408bdb5
 
Alon Levy 408bdb5
     if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
Alon Levy 408bdb5
@@ -382,7 +386,12 @@ int vnc_tls_client_setup(struct VncState *vs,
Alon Levy 408bdb5
             }
Alon Levy 408bdb5
 
Alon Levy 408bdb5
         } else {
Alon Levy 408bdb5
-            gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
Alon Levy 408bdb5
+#if GNUTLS_VERSION_MAJOR < 2
Alon Levy 408bdb5
+            gnutls_anon_server_credentials
Alon Levy 408bdb5
+#else
Alon Levy 408bdb5
+            gnutls_anon_server_credentials_t
Alon Levy 408bdb5
+#endif
Alon Levy 408bdb5
+               anon_cred = vnc_tls_initialize_anon_cred();
Alon Levy 408bdb5
             if (!anon_cred) {
Alon Levy 408bdb5
                 gnutls_deinit(vs->tls.session);
Alon Levy 408bdb5
                 vs->tls.session = NULL;
Alon Levy 408bdb5
-- 
Alon Levy 408bdb5
1.8.2.1
Alon Levy 408bdb5