x11vnc: REQ_ARGS, EV_SYN/SYN_REPORT check. restore -cursor most under -display WAIT

x11vnc/ChangeLog

@@ -1,3 +1,7 @@
+2006-09-10  Karl Runge <runge@karlrunge.com>
+	* x11vnc: minor changes: REQ_ARGS for -sslGenCert, EV_SYN
+	  SYN_REPORT check restore cursor most under -display WAIT.
+
 2006-08-10  Karl Runge <runge@karlrunge.com>
 	* x11vnc: first pass at touchscreens via uinput.
 

x11vnc/cursor.c

@@ -1423,7 +1423,7 @@ void initialize_cursors_mode(void) {
 		}
 	} else {
 		if (screen) {
-			screen->cursor = NULL;	/* dangerous? */
+			screen->cursor = NULL;
 			set_cursor_was_changed(screen);
 		}
 	}

x11vnc/help.c

@@ -1066,6 +1066,11 @@ void print_help(int mode) {
 "\n"
 "                               ssl_vncviewer -mycert ./roger.pem hostname:0\n"
 "\n"
+"                       If you set the env. var REQ_ARGS='...' it will be\n"
+"                       passed to openssl req(1).  A common use would be\n"
+"                       REQ_ARGS='-days 730' to bump up the expiration date\n"
+"                       (2 years in this case).\n"
+"\n"
 "-sslEncKey [pem]       Utility to encrypt an existing PEM file with a\n"
 "                       passphrase you supply when prompted.  For that key to be\n"
 "                       used (e.g. by x11vnc) the passphrase must be supplied\n"
@@ -3463,7 +3468,7 @@ void xopen_display_fail_message(char *disp) {
 	    " will of course change,\n");
 	fprintf(stderr, "   and the directory the cookie file resides in may"
 	    " also be system dependent.\n");
-	fprintf(stderr, "   Sometimes the command \"ps wwaux | grep auth\""
+	fprintf(stderr, "   Sometimes the command \"ps wwwaux | grep auth\""
 	    " can reveal the file location.\n");
 	fprintf(stderr, "\n");
 	fprintf(stderr, "See also: http://www.karlrunge.com/x11vnc/#faq\n");

x11vnc/ssltools.h

@@ -343,7 +343,7 @@ char genCert[] =
 "			direrror \"$DIR/CA/self.cnf.$type\"\n"
 "		fi\n"
 "		cat \"$DIR/CA/self.cnf.$type\" | sed -e \"s/%NAME/$name0/\" > \"$cnf\" || exit 1\n"
-"		\"$OPENSSL\" req -config \"$cnf\" -nodes -new -newkey rsa:2048 -x509 \\\n"
+"		\"$OPENSSL\" req -config \"$cnf\" -nodes -new -newkey rsa:2048 -x509 $REQ_ARGS \\\n"
 "			-keyout \"$DIR/$dest.key\" \\\n"
 "			-out    \"$DIR/$dest.crt\"\n"
 "	else\n"
@@ -351,7 +351,7 @@ char genCert[] =
 "			direrror \"$DIR/CA/ssl.cnf.$type\"\n"
 "		fi\n"
 "		cat \"$DIR/CA/ssl.cnf.$type\" | sed  -e \"s/%NAME/$name0/\" > \"$cnf\" || exit 1\n"
-"		\"$OPENSSL\" req -config \"$cnf\" -nodes -new -newkey rsa:2048 \\\n"
+"		\"$OPENSSL\" req -config \"$cnf\" -nodes -new -newkey rsa:2048 $REQ_ARGS \\\n"
 "			-keyout \"$DIR/$dest.key\" \\\n"
 "			-out    \"$DIR/$dest.req\"\n"
 "	fi\n"

x11vnc/uinput.c

@@ -21,8 +21,14 @@
 #include <sys/ioctl.h>
 #include <linux/input.h>
 #include <linux/uinput.h>
+
+#if !defined(EV_SYN) || !defined(SYN_REPORT)
+#undef UINPUT_OK
+#endif
+
 #endif
 
+
 int check_uinput(void);
 int initialize_uinput(void);
 int set_uinput_accel(char *str);

x11vnc/x11vnc.1

@@ -1,8 +1,8 @@
 .\" This file was automatically generated from x11vnc -help output.
-.TH X11VNC "1" "August 2006" "x11vnc " "User Commands"
+.TH X11VNC "1" "September 2006" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.8.3, lastmod: 2006-08-10
+         version: 0.8.3, lastmod: 2006-09-10
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -1207,6 +1207,13 @@ roger), and on the viewer user on somehost could do
 for example:
 .IP
 ssl_vncviewer \fB-mycert\fR ./roger.pem hostname:0
+.IP
+If you set the env. var REQ_ARGS='...' it will be
+passed to openssl 
+.IR req (1).
+A common use would be
+REQ_ARGS='-days 730' to bump up the expiration date
+(2 years in this case).
 .PP
 \fB-sslEncKey\fR \fI[pem]\fR
 .IP

x11vnc/x11vnc.c

@@ -2825,9 +2825,17 @@ int main(int argc, char* argv[]) {
 			    "\"lurk=\" mode...\n");
 		}
 		lurk_loop(users_list);
+
 	} else if (use_dpy && strstr(use_dpy, "WAIT:") == use_dpy) {
+		char *mcm = multiple_cursors_mode;
+
 		waited_for_client = wait_for_client(&argc_vnc, argv_vnc,
 		    try_http && ! got_httpdir);
+
+		if (!mcm && multiple_cursors_mode) {
+			free(multiple_cursors_mode);
+			multiple_cursors_mode = NULL;
+		}
 	}
 
 	if (use_dpy) {

x11vnc/x11vnc_defs.c

@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.8.3 lastmod: 2006-08-10";
+char lastmod[] = "0.8.3 lastmod: 2006-09-10";
 
 /* X display info */