mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-01 07:14:39 +00:00
Compare commits
5 Commits
cd5ae99d3e
...
f7a332e67f
Author | SHA1 | Date | |
---|---|---|---|
|
f7a332e67f | ||
|
de669aeb60 | ||
|
2241df2257 | ||
|
5c3f2465ca | ||
|
a165cb9143 |
|
@ -55,6 +55,7 @@ script_data.set('DOCTREES_DIR', meson.current_build_dir() + '/doctrees')
|
|||
|
||||
script_data.set('DOXYGEN_CONF', meson.current_build_dir() + '/doxygen.ini')
|
||||
script_data.set('DOXYGEN_CMD', doxygen.full_path())
|
||||
script_data.set('MESON_WERROR', get_option('werror') == true ? 'YES' : 'NO')
|
||||
script_data.set('SPHINX_CMD', sphinx.full_path())
|
||||
script_doxy_sphinx = configure_file(
|
||||
input: 'run_doxygen_sphinx.sh.in',
|
||||
|
|
|
@ -1,2 +1,9 @@
|
|||
#!/bin/sh
|
||||
@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ -E -W -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
|
||||
|
||||
if [ "@MESON_WERROR@" = "YES" ]; then
|
||||
SPHINX_WERROR="-W"
|
||||
else
|
||||
SPHINX_WERROR=""
|
||||
fi
|
||||
|
||||
@DOXYGEN_CMD@ @DOXYGEN_CONF@ && @SPHINX_CMD@ $SPHINX_WERROR -E -q -j auto -d @DOCTREES_DIR@ @SRCDIR@ @OUTDIR@
|
||||
|
|
|
@ -1235,15 +1235,11 @@ vnc_backend_create(struct weston_compositor *compositor,
|
|||
nvnc_set_userdata(backend->server, backend, NULL);
|
||||
nvnc_set_name(backend->server, "Weston VNC backend");
|
||||
|
||||
if (config->server_cert || config->server_key) {
|
||||
if (!nvnc_has_auth()) {
|
||||
weston_log("Neat VNC built without TLS support\n");
|
||||
goto err_output;
|
||||
}
|
||||
if (!config->server_cert && !config->server_key) {
|
||||
weston_log("The VNC backend requires a key and a certificate for TLS security"
|
||||
" (--vnc-tls-cert/--vnc-tls-key)\n");
|
||||
goto err_output;
|
||||
}
|
||||
if (!config->server_cert) {
|
||||
weston_log("Missing TLS certificate (--vnc-tls-cert)\n");
|
||||
goto err_output;
|
||||
|
@ -1269,6 +1265,14 @@ vnc_backend_create(struct weston_compositor *compositor,
|
|||
}
|
||||
|
||||
weston_log("TLS support activated\n");
|
||||
} else {
|
||||
ret = nvnc_enable_auth(backend->server, NVNC_AUTH_REQUIRE_AUTH,
|
||||
vnc_handle_auth, NULL);
|
||||
if (ret) {
|
||||
weston_log("Failed to enable authentication\n");
|
||||
goto err_output;
|
||||
}
|
||||
}
|
||||
|
||||
ret = weston_plugin_api_register(compositor, WESTON_VNC_OUTPUT_API_NAME,
|
||||
&api, sizeof(api));
|
||||
|
|
|
@ -36,11 +36,12 @@ reduce network traffic.
|
|||
.TP
|
||||
\fBtls\-key\fR=\fIfile\fR
|
||||
The file containing the key for doing TLS security. To have TLS security you also need
|
||||
to ship a file containing a certificate.
|
||||
to ship a file containing a certificate. If not specified, VNC will be enabled with password-only
|
||||
authentication.
|
||||
.TP
|
||||
\fBtls\-cert\fR=\fIfile\fR
|
||||
The file containing the certificate for doing TLS security. To have TLS security you also need
|
||||
to ship a key file.
|
||||
to ship a key file. If not specified, VNC will be enabled with password-only authentication.
|
||||
|
||||
.SS Section output
|
||||
.TP
|
||||
|
|
Loading…
Reference in New Issue
Block a user