x11vnc: make https fetch in accept_openssl() work again.

4 files changed, 4 insertions, 25 deletions

diff --git a/x11vnc/README b/x11vnc/README
index 6b2d02f..657ce9a 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -1,5 +1,5 @@
 
-x11vnc README file                         Date: Fri Feb 16 13:40:55 EST 2007
+x11vnc README file                         Date: Fri Feb 16 20:41:26 EST 2007
 
 The following information is taken from these URLs:
 
@@ -10903,7 +10903,7 @@ Options:
                        via the login and password prompt.
 
                        Also in the case of -unixpw, the user logging in can
-                       place a colon at the end of his username and supply
+                       place a colon at the end of her username and supply
                        a few options: scale=, scale_cursor= (or sc=), solid
                        (or so), id=, clear_mods (or cm), clear_keys (or ck),
                        repeat, speeds= (or sp=), readtimeout= (or rd=),
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 6f9b23b..6fdc991 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -786,7 +786,7 @@ void print_help(int mode) {
 "                       via the login and password prompt.\n"
 "\n"
 "                       Also in the case of -unixpw, the user logging in can\n"
-"                       place a colon at the end of his username and supply\n"
+"                       place a colon at the end of her username and supply\n"
 "                       a few options: scale=, scale_cursor= (or sc=), solid\n"
 "                       (or so), id=, clear_mods (or cm), clear_keys (or ck),\n"
 "                       repeat, speeds= (or sp=), readtimeout= (or rd=),\n"
diff --git a/x11vnc/sslhelper.c b/x11vnc/sslhelper.c
index 36a6b42..995c532 100644
--- a/x11vnc/sslhelper.c
+++ b/x11vnc/sslhelper.c
@@ -1453,29 +1453,8 @@ void accept_openssl(int mode) {
 			if (i == 2) {
 				continue;
 			}
-			if (i == listen) {
-				continue;	
-			}
 			close(i);
 		}
-		if (screen->listenSock >= 0) {
-			close(screen->listenSock);
-			FD_CLR(screen->listenSock,&screen->allFds);
-			screen->listenSock = -1;
-		}
-		if (screen->httpListenSock >= 0) {
-			close(screen->httpListenSock);
-			FD_CLR(screen->httpListenSock,&screen->allFds);
-			screen->httpListenSock = -1;
-		}
-		if (openssl_sock >= 0) {
-			close(openssl_sock);
-			openssl_sock = -1;
-		}
-		if (https_sock >= 0) {
-			close(https_sock);
-			https_sock = -1;
-		}
 
 		/*
 		 * sadly, we are a long lived child and so the large
diff --git a/x11vnc/x11vnc.1 b/x11vnc/x11vnc.1
index 1c709cf..e25f83f 100644
--- a/x11vnc/x11vnc.1
+++ b/x11vnc/x11vnc.1
@@ -933,7 +933,7 @@ above command is run as the user who just authenticated
 via the login and password prompt.
 .IP
 Also in the case of \fB-unixpw,\fR the user logging in can
-place a colon at the end of his username and supply
+place a colon at the end of her username and supply
 a few options: scale=, scale_cursor= (or sc=), solid
 (or so), id=, clear_mods (or cm), clear_keys (or ck),
 repeat, speeds= (or sp=), readtimeout= (or rd=),