[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/12] vnc: avoid deprecation warnings for SASL on OS X
From: |
Paolo Bonzini |
Subject: |
[PULL 12/12] vnc: avoid deprecation warnings for SASL on OS X |
Date: |
Tue, 8 Jun 2021 11:40:17 +0200 |
Apple has deprecated sasl.h functions in OS X 10.11. Therefore,
all files that use SASL API need to disable -Wdeprecated-declarations.
Remove the only use that is outside vnc-auth-sasl.c and add the
relevant #pragma GCC diagnostic there.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210604120915.286195-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
ui/vnc-auth-sasl.c | 20 ++++++++++++++++++++
ui/vnc-auth-sasl.h | 1 +
ui/vnc.c | 10 ++--------
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index df7dc08e9f..cf65a0b161 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -28,10 +28,30 @@
#include "vnc.h"
#include "trace.h"
+/*
+ * Apple has deprecated sasl.h functions in OS X 10.11. Therefore,
+ * files that use SASL API need to disable -Wdeprecated-declarations.
+ */
+#ifdef CONFIG_DARWIN
+#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif
+
/* Max amount of data we send/recv for SASL steps to prevent DOS */
#define SASL_DATA_MAX_LEN (1024 * 1024)
+bool vnc_sasl_server_init(Error **errp)
+{
+ int saslErr = sasl_server_init(NULL, "qemu");
+
+ if (saslErr != SASL_OK) {
+ error_setg(errp, "Failed to initialize SASL auth: %s",
+ sasl_errstring(saslErr, NULL, NULL));
+ return false;
+ }
+ return true;
+}
+
void vnc_sasl_client_cleanup(VncState *vs)
{
if (vs->sasl.conn) {
diff --git a/ui/vnc-auth-sasl.h b/ui/vnc-auth-sasl.h
index 1bfb86c6f5..367b8672cc 100644
--- a/ui/vnc-auth-sasl.h
+++ b/ui/vnc-auth-sasl.h
@@ -63,6 +63,7 @@ struct VncDisplaySASL {
char *authzid;
};
+bool vnc_sasl_server_init(Error **errp);
void vnc_sasl_client_cleanup(VncState *vs);
size_t vnc_client_read_sasl(VncState *vs);
diff --git a/ui/vnc.c b/ui/vnc.c
index b3d4d7b9a5..f0a1550d58 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -4154,14 +4154,8 @@ void vnc_display_open(const char *id, Error **errp)
trace_vnc_auth_init(vd, 1, vd->ws_auth, vd->ws_subauth);
#ifdef CONFIG_VNC_SASL
- if (sasl) {
- int saslErr = sasl_server_init(NULL, "qemu");
-
- if (saslErr != SASL_OK) {
- error_setg(errp, "Failed to initialize SASL auth: %s",
- sasl_errstring(saslErr, NULL, NULL));
- goto fail;
- }
+ if (sasl && !vnc_sasl_server_init(errp)) {
+ goto fail;
}
#endif
vd->lock_key_sync = lock_key_sync;
--
2.31.1
- [PULL 07/12] machine: move common smp_parse code to caller, (continued)
- [PULL 07/12] machine: move common smp_parse code to caller, Paolo Bonzini, 2021/06/08
- [PULL 01/12] qom: export more functions for use with non-UserCreatable objects, Paolo Bonzini, 2021/06/08
- [PULL 06/12] machine: move dies from X86MachineState to CpuTopology, Paolo Bonzini, 2021/06/08
- [PULL 05/12] qemu-option: remove now-dead code, Paolo Bonzini, 2021/06/08
- [PULL 03/12] keyval: introduce keyval_parse_into, Paolo Bonzini, 2021/06/08
- [PULL 02/12] keyval: introduce keyval_merge, Paolo Bonzini, 2021/06/08
- [PULL 08/12] machine: add error propagation to mc->smp_parse, Paolo Bonzini, 2021/06/08
- [PULL 10/12] machine: reject -smp dies!=1 for non-PC machines, Paolo Bonzini, 2021/06/08
- [PULL 09/12] machine: pass QAPI struct to mc->smp_parse, Paolo Bonzini, 2021/06/08
- [PULL 11/12] machine: add smp compound property, Paolo Bonzini, 2021/06/08
- [PULL 12/12] vnc: avoid deprecation warnings for SASL on OS X,
Paolo Bonzini <=
- Re: [PULL 00/12] Machine and OS X changes for 2021-06-08, Daniel P . Berrangé, 2021/06/08
- Re: [PULL 00/12] Machine and OS X changes for 2021-06-08, no-reply, 2021/06/09