summaryrefslogtreecommitdiffstats
path: root/x11vnc/screen.c
diff options
context:
space:
mode:
authorrunge <runge>2008-09-21 23:04:47 +0000
committerrunge <runge>2008-09-21 23:04:47 +0000
commit16c7ea1b357ab518ee5a40f2a663843f064479a9 (patch)
tree4f8cceaaa9920ae1ca6e4cb0468e5d87f1d63326 /x11vnc/screen.c
parenta1e5d55e356f4913169f6dd746b14548cc51695d (diff)
downloadlibtdevnc-16c7ea1b357ab518ee5a40f2a663843f064479a9.tar.gz
libtdevnc-16c7ea1b357ab518ee5a40f2a663843f064479a9.zip
x11vnc: Add symmetric key encryption -enc cipher:keyfile,
works with SSVNC. Make -remap work on MacOSX console. update to 0.9.5 strings. Add a couple menu items to tkx11vnc.
Diffstat (limited to 'x11vnc/screen.c')
-rw-r--r--x11vnc/screen.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/x11vnc/screen.c b/x11vnc/screen.c
index 8a8f33b..d2eab06 100644
--- a/x11vnc/screen.c
+++ b/x11vnc/screen.c
@@ -3080,7 +3080,11 @@ void announce(int lport, int ssl, char *iface) {
if (! ssl) {
tvdt = "The VNC desktop is: ";
} else {
- tvdt = "The SSL VNC desktop is: ";
+ if (enc_str) {
+ tvdt = "The ENC VNC desktop is: ";
+ } else {
+ tvdt = "The SSL VNC desktop is: ";
+ }
}
if (iface != NULL && *iface != '\0' && strcmp(iface, "any")) {
@@ -3209,7 +3213,11 @@ void set_vnc_desktop_name(void) {
if (stunnel_port) {
fprintf(stdout, "SSLPORT=%d\n", stunnel_port);
} else if (use_openssl) {
- fprintf(stdout, "SSLPORT=%d\n", screen->port);
+ if (enc_str) {
+ fprintf(stdout, "ENCPORT=%d\n", screen->port);
+ } else {
+ fprintf(stdout, "SSLPORT=%d\n", screen->port);
+ }
}
fflush(stdout);
if (flagfile) {