diff options
| author | runge <[email protected]> | 2009-12-21 11:02:31 -0500 |
|---|---|---|
| committer | runge <[email protected]> | 2009-12-21 11:02:31 -0500 |
| commit | 9659bc129f520b635b7056cf5d746a35003a6b80 (patch) | |
| tree | f393ac13d20b5b707c6360460d265e8b0f3aab73 /x11vnc/sslhelper.c | |
| parent | 10f325e2767290a8bf0ad041ecb903c621486faa (diff) | |
| download | libtdevnc-9659bc129f520b635b7056cf5d746a35003a6b80.tar.gz libtdevnc-9659bc129f520b635b7056cf5d746a35003a6b80.zip | |
x11vnc: -DENC_HAVE_OPENSSL=0 to disable enc.h but still
have ssl. Tweak ps command in find_display. Try to handle
AIX su. Ignore an initial newline at login: for -unixpw.
Diffstat (limited to 'x11vnc/sslhelper.c')
| -rw-r--r-- | x11vnc/sslhelper.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/x11vnc/sslhelper.c b/x11vnc/sslhelper.c index 42a5728..5af3376 100644 --- a/x11vnc/sslhelper.c +++ b/x11vnc/sslhelper.c @@ -2940,11 +2940,11 @@ if (db) fprintf(stderr, "tv_sec: %d - '%s'\n", (int) tv.tv_sec, last_get); FD_ZERO(&rd); FD_SET(s_in, &rd); - if (db) fprintf(stderr, "is_ssl_readable: begin select(%d secs) %.6f\n", tv.tv_sec, dnow()); + if (db) fprintf(stderr, "is_ssl_readable: begin select(%d secs) %.6f\n", (int) tv.tv_sec, dnow()); do { nfd = select(s_in+1, &rd, NULL, NULL, &tv); } while (nfd < 0 && errno == EINTR); - if (db) fprintf(stderr, "is_ssl_readable: finish select(%d secs) %.6f\n", tv.tv_sec, dnow()); + if (db) fprintf(stderr, "is_ssl_readable: finish select(%d secs) %.6f\n", (int) tv.tv_sec, dnow()); if (db) fprintf(stderr, "https nfd: %d\n", nfd); @@ -4081,12 +4081,18 @@ if (db) rfbLog("raw_xfer bad write: %d -> %d | %d/%d errno=%d\n", csock, s_out #endif /* FORK_OK */ } +/* compile with -DENC_HAVE_OPENSSL=0 to disable enc stuff but still have ssl */ + #define ENC_MODULE + #if LIBVNCSERVER_HAVE_LIBSSL +#ifndef ENC_HAVE_OPENSSL #define ENC_HAVE_OPENSSL 1 +#endif #else #define ENC_HAVE_OPENSSL 0 #endif + #include "enc.h" static void symmetric_encryption_xfer(int csock, int s_in, int s_out) { |