Adam Tkac 5009736
diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx
Adam Tkac 5009736
--- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434	2008-10-10 17:48:22.000000000 +0200
Adam Tkac 5009736
+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx	2008-10-22 18:35:46.000000000 +0200
Adam Tkac 5009736
@@ -37,6 +37,8 @@
Adam Tkac 5009736
 #include "ServerDialog.h"
Adam Tkac 5009736
 #include "PasswdDialog.h"
Adam Tkac 5009736
 #include "parameters.h"
Adam Tkac 5009736
+#include <string>
Adam Tkac 5009736
+#include <iostream>
Adam Tkac 5009736
 
Adam Tkac 5009736
 using namespace rfb;
Adam Tkac 5009736
 
Adam Tkac 5009736
@@ -209,6 +211,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 5009736
+    std::string s;
Adam Tkac 5009736
+    std::cin >> s;
Adam Tkac 5009736
+    *password = strdup(s.c_str());
Adam Tkac 5009736
+    if(user) *user = 0;
Adam Tkac 5009736
+      return;
Adam Tkac 5009736
+  }
Adam Tkac 5009736
+
Adam Tkac 5009736
   const char* secType = secTypeName(getCurrentCSecurity()->getType());
Adam Tkac 5009736
   const char* titlePrefix = _("VNC authentication");
Adam Tkac 5009736
   unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
Adam Tkac 5009736
diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h
Adam Tkac 5009736
--- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434	2006-05-18 13:08:21.000000000 +0200
Adam Tkac 5009736
+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h	2008-10-22 18:08:47.000000000 +0200
Adam Tkac 5009736
@@ -41,6 +41,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 5009736
diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx
Adam Tkac 5009736
--- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434	2008-09-28 07:08:48.000000000 +0200
Adam Tkac 5009736
+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx	2008-10-22 18:04:00.000000000 +0200
Adam Tkac 5009736
@@ -58,6 +58,7 @@ IntParameter wmDecorationHeight("WMDecor
Adam Tkac 5009736
                                 "manager decoration around a window", 24);
Adam Tkac 5009736
 StringParameter passwordFile("PasswordFile",
Adam Tkac 5009736
                              "Password file for VNC authentication", "");
Adam Tkac 5009736
+BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
Adam Tkac 5009736
 AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile);
Adam Tkac 5009736
 
Adam Tkac 5009736
 BoolParameter useLocalCursor("UseLocalCursor",
Adam Tkac 5009736
diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man
Adam Tkac 5009736
--- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434	2006-06-02 06:43:52.000000000 +0200
Adam Tkac 5009736
+++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man	2008-10-22 18:04:00.000000000 +0200
Adam Tkac 5009736
@@ -115,6 +115,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