From 4dbc5d5a129ac009521da08bdc83eba5ea1eb51b Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Wed, 29 Oct 2008 23:41:28 +0000
Subject: x11vnc: -http_oneport for single port HTTP and VNC. Improve
 find_display wrt lsof blocking with -b.

---
 x11vnc/remote.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'x11vnc/remote.c')

diff --git a/x11vnc/remote.c b/x11vnc/remote.c
index 2464189..3d0e031 100644
--- a/x11vnc/remote.c
+++ b/x11vnc/remote.c
@@ -333,13 +333,13 @@ int check_httpdir(void) {
 		len = strlen(prog) + 21 + 1;
 		*q = '\0';
 		httpdir = (char *) malloc(len);
-		if (use_openssl || use_stunnel || http_ssl) {
+		if (!enc_str && (use_openssl || use_stunnel || http_ssl)) {
 			snprintf(httpdir, len, "%s/../share/x11vnc/classes/ssl", prog);
 		} else {
 			snprintf(httpdir, len, "%s/../share/x11vnc/classes", prog);
 		}
 		if (stat(httpdir, &sbuf) != 0) {
-			if (use_openssl || use_stunnel || http_ssl) {
+			if (!enc_str && (use_openssl || use_stunnel || http_ssl)) {
 				snprintf(httpdir, len, "%s/../classes/ssl", prog);
 			} else {
 				snprintf(httpdir, len, "%s/../classes", prog);
@@ -367,7 +367,7 @@ int check_httpdir(void) {
 				"/usr/share/x11vnc/classes/ssl",
 				NULL
 			};
-			if (use_openssl || use_stunnel || http_ssl) {
+			if (!enc_str && (use_openssl || use_stunnel || http_ssl)) {
 				use = ssllist;
 			} else {
 				use = list;
-- 
cgit v1.2.1