From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 1 May 2015 10:44:46 +0000 (+0100)
Subject: ui: remove check for failure of qemu_acl_init()
X-Git-Tag: v2.4.0-rc0~127^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b2c1a38eeaba5d8bfe92281e9e680361e09ee3b;p=thirdparty%2Fqemu.git

ui: remove check for failure of qemu_acl_init()

The qemu_acl_init() function has long since stopped being able
to return NULL, since g_malloc will abort on OOM. As such the
checks for NULL were unreachable code.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/ui/vnc.c b/ui/vnc.c
index 2dccae96c6b..076355d9c5e 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3609,10 +3609,6 @@ void vnc_display_open(const char *id, Error **errp)
             aclname = g_strdup_printf("vnc.%s.x509dname", vs->id);
         }
         vs->tls.acl = qemu_acl_init(aclname);
-        if (!vs->tls.acl) {
-            fprintf(stderr, "Failed to create x509 dname ACL\n");
-            exit(1);
-        }
         g_free(aclname);
     }
 #endif
@@ -3626,10 +3622,6 @@ void vnc_display_open(const char *id, Error **errp)
             aclname = g_strdup_printf("vnc.%s.username", vs->id);
         }
         vs->sasl.acl = qemu_acl_init(aclname);
-        if (!vs->sasl.acl) {
-            fprintf(stderr, "Failed to create username ACL\n");
-            exit(1);
-        }
         g_free(aclname);
     }
 #endif