rpms/vnc/devel vnc-vncpasswd.patch,NONE,1.1 vnc.spec,1.77,1.78

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28116

Modified Files:
	vnc.spec 
Added Files:
	vnc-vncpasswd.patch 
Log Message:
* Mon Jun 27 2005 Tim Waugh <twaugh at redhat.com>
- Fixed vncpasswd crash (bug #160471).


vnc-vncpasswd.patch:
 Password.cxx |    3 +++
 Password.h   |    1 +
 2 files changed, 4 insertions(+)

--- NEW FILE vnc-vncpasswd.patch ---
--- vnc-4_1_1-unixsrc/common/rfb/Password.cxx.vncpasswd	2005-06-27 15:08:30.000000000 +0100
+++ vnc-4_1_1-unixsrc/common/rfb/Password.cxx	2005-06-27 15:18:28.000000000 +0100
@@ -38,6 +38,9 @@
 PlainPasswd::PlainPasswd(char* pwd) : CharArray(pwd) {
 }
 
+PlainPasswd::PlainPasswd(int len) : CharArray(len) {
+}
+
 PlainPasswd::PlainPasswd(const ObfuscatedPasswd& obfPwd) : CharArray(9) {
   if (obfPwd.length < 8)
     throw rdr::Exception("bad obfuscated password length");
--- vnc-4_1_1-unixsrc/common/rfb/Password.h.vncpasswd	2005-06-27 15:18:46.000000000 +0100
+++ vnc-4_1_1-unixsrc/common/rfb/Password.h	2005-06-27 15:18:56.000000000 +0100
@@ -28,6 +28,7 @@
   public:
     PlainPasswd();
     PlainPasswd(char* pwd);
+    PlainPasswd(int l);
     PlainPasswd(const ObfuscatedPasswd& obfPwd);
     ~PlainPasswd();
     void replaceBuf(char* b);


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- vnc.spec	22 Jun 2005 17:32:45 -0000	1.77
+++ vnc.spec	27 Jun 2005 14:27:01 -0000	1.78
@@ -24,6 +24,7 @@
 Patch6:    vnc-build.patch
 Patch7:    vnc-fPIC.patch
 Patch8:    vnc-restart.patch
+Patch9:    vnc-vncpasswd.patch
 Patch10:   vnc-def.patch
 Patch11:   vnc-xorg.patch
 Patch13:   vnc-xorg-x11-fixes.patch
@@ -74,6 +75,7 @@
 %patch6 -p1 -b .build
 %patch7 -p1 -b .fPIC
 %patch8 -p1 -b .restart
+%patch9 -p1 -b .vncpasswd
 %patch10 -p1 -b .def
 %patch11 -p1 -b .xorg
 %patch13 -p1 -b .xorg-x11-fixes
@@ -208,6 +210,9 @@
 /usr/X11R6
 
 %changelog
+* Mon Jun 27 2005 Tim Waugh <twaugh at redhat.com>
+- Fixed vncpasswd crash (bug #160471).
+
 * Wed Jun 22 2005 Tim Waugh <twaugh at redhat.com>
 - Updated URL in vncservers file (bug #161334).