diff options
| author | runge <runge> | 2007-05-01 22:51:56 +0000 |
|---|---|---|
| committer | runge <runge> | 2007-05-01 22:51:56 +0000 |
| commit | 85303147a02cce513cb62fc25ab728238dec69b7 (patch) | |
| tree | 90b37234396e6dbb820d813b76ff709f2a569056 /x11vnc/sslhelper.c | |
| parent | 3fcab6f1ec5238977b28d5d6f5fbae365b1254fa (diff) | |
| download | libtdevnc-85303147a02cce513cb62fc25ab728238dec69b7.tar.gz libtdevnc-85303147a02cce513cb62fc25ab728238dec69b7.zip | |
ssl: java viewer patches, onetimekey; x11vnc setsid/setpgrp and -cc 4 for -create
Diffstat (limited to 'x11vnc/sslhelper.c')
| -rw-r--r-- | x11vnc/sslhelper.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x11vnc/sslhelper.c b/x11vnc/sslhelper.c index 538288a..36aeb8d 100644 --- a/x11vnc/sslhelper.c +++ b/x11vnc/sslhelper.c @@ -1809,7 +1809,7 @@ if (db) fprintf(stderr, "iface: %s\n", iface); if (vsock < 0) { - rfbLog("SSL: accept_openssl: connection from ssl_helper failed.\n"); + rfbLog("SSL: accept_openssl: connection from ssl_helper FAILED.\n"); rfbLogPerror("accept"); kill(pid, SIGTERM); @@ -1829,6 +1829,9 @@ if (db) fprintf(stderr, "iface: %s\n", iface); if (db) fprintf(stderr, "accept_openssl: vsock: %d\n", vsock); n = read(vsock, rcookie, strlen(cookie)); + if (n < 0 && errno != 0) { + rfbLogPerror("read"); + } if (certret) { struct stat sbuf; @@ -1854,10 +1857,7 @@ if (db) fprintf(stderr, "iface: %s\n", iface); } if (n != (int) strlen(cookie) || strncmp(cookie, rcookie, n)) { - rfbLog("SSL: accept_openssl: cookie from ssl_helper failed. %d\n", n); - if (errno != 0) { - rfbLogPerror("read"); - } + rfbLog("SSL: accept_openssl: cookie from ssl_helper FAILED. %d\n", n); if (db) fprintf(stderr, "'%s'\n'%s'\n", cookie, rcookie); close(vsock); @@ -2093,7 +2093,7 @@ if (db > 1) fprintf(stderr, "ssl_init: 4\n"); } else if (rc < 0) { - rfbLog("SSL: ssl_helper: SSL_accept() fatal: %d\n", rc); + rfbLog("SSL: ssl_helper: SSL_accept() *FATAL: %d\n", rc); return 0; } else if (dnow() > start + 3.0) { |