diff options
| author | Paolo Bonzini | 2021-06-04 14:09:15 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-06-15 17:17:09 +0200 |
| commit | b65310ab34cbada47a5570c94d6f8f5efd39d171 (patch) | |
| tree | 66fe7509aafcb2c5a644635bcbc8e94e29b483b2 /ui/vnc-auth-sasl.c | |
| parent | Merge remote-tracking branch 'remotes/berrange-gitlab/tags/misc-fixes-pull-re... (diff) | |
| download | qemu-b65310ab34cbada47a5570c94d6f8f5efd39d171.tar.gz qemu-b65310ab34cbada47a5570c94d6f8f5efd39d171.tar.xz qemu-b65310ab34cbada47a5570c94d6f8f5efd39d171.zip | |
vnc: avoid deprecation warnings for SASL on OS X
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>
Diffstat (limited to 'ui/vnc-auth-sasl.c')
| -rw-r--r-- | ui/vnc-auth-sasl.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index df7dc08e9f..47fdae5b21 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 ignored "-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) { |