From b74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1 Mon Sep 17 00:00:00 2001
From: runge <runge@karlrunge.com>
Date: Sun, 18 Apr 2010 19:37:37 -0400
Subject: Improvements to demo scripts. Alias -coe for -connect_or_exit.  Fix
 HAVE_V4L2. Warn no Xvfb, Xdummy, or Xvnc. Xinerama screens.

---
 x11vnc/connections.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'x11vnc/connections.c')

diff --git a/x11vnc/connections.c b/x11vnc/connections.c
index f465325..c664377 100644
--- a/x11vnc/connections.c
+++ b/x11vnc/connections.c
@@ -308,7 +308,7 @@ static rfbClientPtr *client_match(char *str) {
 			}
 			if (ipv6_ip(str)) {
 				;
-			} else if (! dotted_ip(str)) {
+			} else if (! dotted_ip(str, 0)) {
 				char *orig = rstr;
 				rstr = host2ip(rstr);
 				free(orig);
@@ -385,7 +385,7 @@ void set_client_input(char *str) {
 		return;
 	}
 
-	p = strchr(str, ':');
+	p = strrchr(str, ':');
 	if (! p) {
 		return;
 	}
@@ -1067,7 +1067,7 @@ int check_access(char *addr) {
 		}
 		if (ipv6_ip(p)) {
 			chk = p;
-		} else if (! dotted_ip(p)) {
+		} else if (! dotted_ip(p, 1)) {
 			r = host2ip(p);
 			if (r == NULL || *r == '\0') {
 				rfbLog("check_access: bad lookup \"%s\"\n", p);
@@ -1837,9 +1837,8 @@ void check_ipv6_listen(long usec) {
 			screen->httpListenSock = save;	
 		}
 	}
-#else
-	if (usec) {}
 #endif
+	if (usec) {}
 }
 
 /*
-- 
cgit v1.2.1