summaryrefslogtreecommitdiffstats
path: root/x11vnc/x11vnc.c
diff options
context:
space:
mode:
authorJohannes Schindelin <[email protected]>2010-03-13 17:45:19 +0100
committerJohannes Schindelin <[email protected]>2010-03-13 17:45:19 +0100
commitb991c61628bb2eb93071f23784638614734b9526 (patch)
treeedab99e445ec377b7cdca798e60511373c4d1bba /x11vnc/x11vnc.c
parent19aa466a967aa15f873c49508342a235100056dc (diff)
parent018aac069a88243279e4172c44fb76eb881818d2 (diff)
downloadlibtdevnc-b991c61628bb2eb93071f23784638614734b9526.tar.gz
libtdevnc-b991c61628bb2eb93071f23784638614734b9526.zip
Merge remote branch 'sf/master'
Diffstat (limited to 'x11vnc/x11vnc.c')
-rw-r--r--x11vnc/x11vnc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c
index 87fdb1a..d3a4b7c 100644
--- a/x11vnc/x11vnc.c
+++ b/x11vnc/x11vnc.c
@@ -2844,6 +2844,11 @@ int main(int argc, char* argv[]) {
exit(0);
continue;
}
+ if (!strcmp(arg, "-sslScripts")) {
+ sslScripts();
+ exit(0);
+ continue;
+ }
if (!strcmp(arg, "-stunnel")) {
use_stunnel = 1;
got_tls = -1000;