x11vnc: tweaks to prepare_x11vnc_dist.sh. set cd->unixname in apply_opts().

7 files changed, 42 insertions, 34 deletions

diff --git a/x11vnc/ChangeLog b/x11vnc/ChangeLog
index 1a03b2c..5e9a59c 100644
--- a/x11vnc/ChangeLog
+++ b/x11vnc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-08  Karl Runge <runge@karlrunge.com>
+	* x11vnc: set cd->unixname in apply_opts.  Print message in
+	  vnc_reflect_resize.  Some tweaks to prepare_x11vnc_dist.sh
+
 2010-05-01  Karl Runge <runge@karlrunge.com>
 	* x11vnc: X11VNC_DISABLE_SSL_CLIENT_MODE option to disable SSL
 	  client role in reverse connections.  Improvements to logging in
diff --git a/x11vnc/README b/x11vnc/README
index d83fc8d..d440a82 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -2,7 +2,7 @@
 Copyright (C) 2002-2010 Karl J. Runge <runge@karlrunge.com>
 All rights reserved.
 
-x11vnc README file                         Date: Sun May  2 18:25:14 EDT 2010
+x11vnc README file                         Date: Sat May  8 19:32:50 EDT 2010
 
 The following information is taken from these URLs:
 
@@ -912,7 +912,7 @@ make
      * Coming Soon.
 
 
-   Here are some features that will appear in the 0.9.10 release:
+   Here are some features that appeared in the 0.9.10 release:
      * The included SSL enabled Java applet viewer now supports Chained
        SSL Certificates. The debugCerts=yes applet parameter aids
        troubleshooting certificate validation. The x11vnc -ssl mode has
@@ -11217,7 +11217,7 @@ Unix and Mac OS X:
 
     Unpack the archive:
 
-        % gzip -dc ssvnc-1.0.27.tar.gz | tar xvf -
+        % gzip -dc ssvnc-1.0.28.tar.gz | tar xvf -
 
     Run the GUI:
 
@@ -11225,7 +11225,7 @@ Unix and Mac OS X:
 
         % ./ssvnc/MacOSX/ssvnc             (for Mac OS X)
 
-    The smaller file "ssvnc_no_windows-1.0.27.tar.gz"
+    The smaller file "ssvnc_no_windows-1.0.28.tar.gz"
     could have been used as well.
 
     On MacOSX you could also click on the SSVNC app icon in the Finder.
@@ -11271,8 +11271,8 @@ Unix/MacOSX Install:
 
     For the conventional source tarball it will compile and install, e.g.:
 
-       gzip -dc ssvnc-1.0.27.src.tar.gz | tar xvf -
-       cd ssvnc-1.0.27
+       gzip -dc ssvnc-1.0.28.src.tar.gz | tar xvf -
+       cd ssvnc-1.0.28
        make config
        make all
        make PREFIX=/my/install/dir install
@@ -11285,7 +11285,7 @@ Windows:
 
     Unzip, using WinZip or a similar utility, the zip file:
 
-        ssvnc-1.0.27.zip
+        ssvnc-1.0.28.zip
 
     Run the GUI, e.g.:
 
@@ -11297,7 +11297,7 @@ Windows:
 
     select Open, and then OK to launch it.
 
-    The smaller file "ssvnc_windows_only-1.0.27.zip"
+    The smaller file "ssvnc_windows_only-1.0.28.zip"
     could have been used as well.
 
     You can make a Windows shortcut to this program if you want to.
@@ -11964,25 +11964,25 @@ r
    "ssvnc_unix_only" (or "ssvnc_no_windows" to recompile).
       On Mac OS X? Use "ssvnc_no_windows".
       On Windows? Use "ssvnc_windows_only".
-  ssvnc_windows_only-1.0.26.zip      Windows Binaries Only.  No source included
+  ssvnc_windows_only-1.0.27.zip      Windows Binaries Only.  No source included
  (6.2MB)
-  ssvnc_no_windows-1.0.26.tar.gz     Unix and Mac OS X Only. No Windows binarie
+  ssvnc_no_windows-1.0.27.tar.gz     Unix and Mac OS X Only. No Windows binarie
 s.  Source included. (10.1MB)
-  ssvnc_unix_only-1.0.26.tar.gz      Unix Binaries Only.     No source included
+  ssvnc_unix_only-1.0.27.tar.gz      Unix Binaries Only.     No source included
 . (7.2MB)
-  ssvnc_unix_minimal-1.0.26.tar.gz   Unix Minimal.  You must supply your own vn
+  ssvnc_unix_minimal-1.0.27.tar.gz   Unix Minimal.  You must supply your own vn
 cviewer and stunnel. (0.2MB)
 
-  ssvnc-1.0.26.tar.gz                All Unix, Mac OS X, and Windows binaries a
+  ssvnc-1.0.27.tar.gz                All Unix, Mac OS X, and Windows binaries a
 nd source TGZ. (16.1MB)
-  ssvnc-1.0.26.zip                   All Unix, Mac OS X, and Windows binaries a
+  ssvnc-1.0.27.zip                   All Unix, Mac OS X, and Windows binaries a
 nd source ZIP. (16.4MB)
-  ssvnc_all-1.0.26.zip               All Unix, Mac OS X, and Windows binaries a
+  ssvnc_all-1.0.27.zip               All Unix, Mac OS X, and Windows binaries a
 nd source AND full archives in the zip dir. (19.2MB)
 
 
    Here is a conventional source tarball:
-  ssvnc-1.0.26.src.tar.gz            Conventional Source for SSVNC GUI and Unix
+  ssvnc-1.0.27.src.tar.gz            Conventional Source for SSVNC GUI and Unix
  VNCviewer  (0.5MB)
 
    it will be of use to those who do not want the SSVNC
@@ -12000,19 +12000,19 @@ nd source AND full archives in the zip dir. (19.2MB)
    "ssvnc_all", you may need to run the "./build.unix" script in the top
    directory to recompile for your operating system.
 
-   Here are the corresponding 1.0.27 development bundles (Please help
+   Here are the corresponding 1.0.28 development bundles (Please help
    test them):
 
-  ssvnc_windows_only-1.0.27.zip
-  ssvnc_no_windows-1.0.27.tar.gz
-  ssvnc_unix_only-1.0.27.tar.gz
-  ssvnc_unix_minimal-1.0.27.tar.gz
+  ssvnc_windows_only-1.0.28.zip
+  ssvnc_no_windows-1.0.28.tar.gz
+  ssvnc_unix_only-1.0.28.tar.gz
+  ssvnc_unix_minimal-1.0.28.tar.gz
 
-  ssvnc-1.0.27.tar.gz
-  ssvnc-1.0.27.zip
-  ssvnc_all-1.0.27.zip
+  ssvnc-1.0.28.tar.gz
+  ssvnc-1.0.28.zip
+  ssvnc_all-1.0.28.zip
 
-  ssvnc-1.0.27.src.tar.gz            Conventional Source for SSVNC GUI and Unix
+  ssvnc-1.0.28.src.tar.gz            Conventional Source for SSVNC GUI and Unix
  VNCviewer  (0.5MB)
 
 
@@ -12035,6 +12035,7 @@ nd source AND full archives in the zip dir. (19.2MB)
       Release 1.0.24 at Sourceforge.net
       Release 1.0.25 at Sourceforge.net
       Release 1.0.26 at Sourceforge.net
+      Release 1.0.27 at Sourceforge.net
 
 
    Please help test the UltraVNC File Transfer support in the native Unix
@@ -12099,7 +12100,7 @@ x11vnc: a VNC server for real X displays
    Here are all of x11vnc command line options:
 % x11vnc -opts      (see below for -help long descriptions)
 
-x11vnc: allow VNC connections to real X11 displays. 0.9.11 lastmod: 2010-05-02
+x11vnc: allow VNC connections to real X11 displays. 0.9.11 lastmod: 2010-05-08
 
 x11vnc options:
   -display disp            -auth file               -N                     
@@ -12229,7 +12230,7 @@ libvncserver-tight-extension options:
 
 % x11vnc -help
 
-x11vnc: allow VNC connections to real X11 displays. 0.9.11 lastmod: 2010-05-02
+x11vnc: allow VNC connections to real X11 displays. 0.9.11 lastmod: 2010-05-08
 
 (type "x11vnc -opts" to just list the options.)
 
diff --git a/x11vnc/connections.c b/x11vnc/connections.c
index 246acae..d1af60e 100644
--- a/x11vnc/connections.c
+++ b/x11vnc/connections.c
@@ -160,9 +160,9 @@ char *list_clients(void) {
          * <id>:<ip>:<port>:<user>:<unix>:<hostname>:<input>:<loginview>:<time>,
 	 * 8+1+64+1+5+1+24+1+24+1+256+1+5+1+1+1+10+1
 	 * 123.123.123.123:60000/0x11111111-rw,
-	 * so count+1 * 500 must cover it.
+	 * so count+1 * 1000 must cover it.
 	 */
-	list = (char *) malloc((count+1)*500);
+	list = (char *) malloc((count+1)*1000);
 	
 	list[0] = '\0';
 
diff --git a/x11vnc/screen.c b/x11vnc/screen.c
index e3c6a6f..c41774c 100644
--- a/x11vnc/screen.c
+++ b/x11vnc/screen.c
@@ -1341,6 +1341,8 @@ rfbBool vnc_reflect_resize(rfbClient *cl)  {
 		free(cl->frameBuffer);
 	}
 	cl->frameBuffer= malloc(cl->width * cl->height * cl->format.bitsPerPixel/8);
+	rfbLog("vnc_reflect_resize: %dx%dx%d first=%d\n", cl->width, cl->height,
+	    cl->format.bitsPerPixel, first);
 	if (!first) {
 		do_new_fb(1);
 	}
diff --git a/x11vnc/unixpw.c b/x11vnc/unixpw.c
index 946e371..90c2e06 100644
--- a/x11vnc/unixpw.c
+++ b/x11vnc/unixpw.c
@@ -2005,9 +2005,6 @@ static void apply_opts (char *user) {
 	ClientData *cd;
 	int i, notmode = 0;
 
-	if (! unixpw_list) {
-		return;
-	}
 	if (! unixpw_client) {
 		rfbLog("apply_opts: unixpw_client is NULL\n");
 		clean_up_exit(1);
@@ -2024,8 +2021,12 @@ static void apply_opts (char *user) {
 			free(cd->unixname);
 		}
 		cd->unixname = strdup(user);
+		rfbLog("apply_opts: set unixname to: %s\n", cd->unixname);
 	}
 
+	if (! unixpw_list) {
+		return;
+	}
 	str = strdup(unixpw_list);
 
 	/* apply any per-user options. */
diff --git a/x11vnc/x11vnc.1 b/x11vnc/x11vnc.1
index eb3ed90..7de21cb 100644
--- a/x11vnc/x11vnc.1
+++ b/x11vnc/x11vnc.1
@@ -2,7 +2,7 @@
 .TH X11VNC "1" "May 2010" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.9.11, lastmod: 2010-05-02
+         version: 0.9.11, lastmod: 2010-05-08
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
diff --git a/x11vnc/x11vnc_defs.c b/x11vnc/x11vnc_defs.c
index d50cdb2..9ef72e6 100644
--- a/x11vnc/x11vnc_defs.c
+++ b/x11vnc/x11vnc_defs.c
@@ -47,7 +47,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.9.11 lastmod: 2010-05-02";
+char lastmod[] = "0.9.11 lastmod: 2010-05-08";
 
 /* X display info */