sharkcz / rpms / tigervnc

Forked from rpms/tigervnc 4 years ago
Clone
Adam Tkac 1c75684
diff -up tigervnc-1.0.90-20101208svn4225/unix/vncviewer/CConn.cxx.102434 tigervnc-1.0.90-20101208svn4225/unix/vncviewer/CConn.cxx
Adam Tkac 1c75684
--- tigervnc-1.0.90-20101208svn4225/unix/vncviewer/CConn.cxx.102434	2010-12-08 15:42:16.000000000 +0100
Adam Tkac 1c75684
+++ tigervnc-1.0.90-20101208svn4225/unix/vncviewer/CConn.cxx	2010-12-08 17:35:37.898546362 +0100
Adam Tkac 1c75684
@@ -38,6 +38,8 @@
Adam Tkac 1c75684
 #include <network/TcpSocket.h>
Adam Tkac 1c75684
 #include <cassert>
Adam Tkac 1c75684
 #include <list>
Adam Tkac 5009736
+#include <string>
Adam Tkac 5009736
+#include <iostream>
Adam Tkac 5009736
 
Adam Tkac 1c75684
 #include "TXViewport.h"
Adam Tkac 1c75684
 #include "DesktopWindow.h"
Adam Tkac 1c75684
@@ -232,6 +234,15 @@ void CConn::getUserPasswd(char** user, c
Adam Tkac 5009736
     return;
Adam Tkac 5009736
   }
Adam Tkac 5009736
 
Adam Tkac 5009736
+  /* XXX Who wrote this code? Yes, it is really ugly */
Adam Tkac 5009736
+  if (passwdInput) {
Adam Tkac dfc6862
+   std::string s;
Adam Tkac dfc6862
+   std::cin >> s;
Adam Tkac dfc6862
+   *password = strdup(s.c_str());
Adam Tkac dfc6862
+   if (user) *user = 0;
Adam Tkac dfc6862
+     return;
Adam Tkac 5009736
+  }
Adam Tkac 5009736
+
Adam Tkac dfc6862
   const char* secType = secTypeName(csecurity->getType());
Adam Tkac 5009736
   const char* titlePrefix = _("VNC authentication");
Adam Tkac 5009736
   unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
Adam Tkac 1c75684
diff -up tigervnc-1.0.90-20101208svn4225/unix/vncviewer/parameters.h.102434 tigervnc-1.0.90-20101208svn4225/unix/vncviewer/parameters.h
Adam Tkac 1c75684
--- tigervnc-1.0.90-20101208svn4225/unix/vncviewer/parameters.h.102434	2009-03-23 17:49:47.000000000 +0100
Adam Tkac 1c75684
+++ tigervnc-1.0.90-20101208svn4225/unix/vncviewer/parameters.h	2010-12-08 17:34:44.138568781 +0100
Adam Tkac dfc6862
@@ -42,6 +42,7 @@ extern rfb::BoolParameter customCompress
Adam Tkac 5009736
 extern rfb::IntParameter compressLevel;
Adam Tkac 5009736
 extern rfb::BoolParameter noJpeg;
Adam Tkac 5009736
 extern rfb::IntParameter qualityLevel;
Adam Tkac 5009736
+extern rfb::BoolParameter passwdInput;
Adam Tkac 5009736
 
Adam Tkac 5009736
 extern char aboutText[];
Adam Tkac 5009736
 extern char* programName;
Adam Tkac 1c75684
diff -up tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.cxx.102434 tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.cxx
Adam Tkac 1c75684
--- tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.cxx.102434	2010-11-18 14:33:57.000000000 +0100
Adam Tkac 1c75684
+++ tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.cxx	2010-12-08 17:34:44.138568781 +0100
Adam Tkac 1c75684
@@ -61,7 +61,7 @@ IntParameter wmDecorationHeight("WMDecor
Adam Tkac 5009736
 StringParameter passwordFile("PasswordFile",
Adam Tkac 5009736
                              "Password file for VNC authentication", "");
Adam Tkac dfc6862
 AliasParameter passwd("passwd", "Alias for PasswordFile", &passwordFile);
Adam Tkac dfc6862
-
Adam Tkac 5009736
+BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
Adam Tkac 5009736
 BoolParameter useLocalCursor("UseLocalCursor",
Adam Tkac dfc6862
                              "Render the mouse cursor locally", true);
Adam Tkac dfc6862
 BoolParameter dotWhenNoCursor("DotWhenNoCursor",
Adam Tkac 1c75684
diff -up tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.man.102434 tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.man
Adam Tkac 1c75684
--- tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.man.102434	2009-10-07 17:13:00.000000000 +0200
Adam Tkac 1c75684
+++ tigervnc-1.0.90-20101208svn4225/unix/vncviewer/vncviewer.man	2010-12-08 17:34:44.138568781 +0100
Adam Tkac dfc6862
@@ -119,6 +119,11 @@ the server, you can specify it here to a
Adam Tkac 5009736
 "~/.vnc/passwd".
Adam Tkac 5009736
 
Adam Tkac 5009736
 .TP
Adam Tkac 5009736
+.B \-passwdInput \fItrue, false\fP
Adam Tkac 5009736
+Force standard vnc dialog to getting password and reads password from stdin.
Adam Tkac 5009736
+Default is false(shows dialog window)
Adam Tkac 5009736
+
Adam Tkac 5009736
+.TP
Adam Tkac 5009736
 .B \-Shared
Adam Tkac 5009736
 When you make a connection to a VNC server, all other existing connections are
Adam Tkac 5009736
 normally closed.  This option requests that they be left open, allowing you to