From 2b2c1a38eeaba5d8bfe92281e9e680361e09ee3b Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 1 May 2015 11:44:46 +0100 Subject: [PATCH] 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 Reviewed-by: Eric Blake Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 2dccae96c6..076355d9c5 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 -- 2.11.4.GIT