Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/vnc/patches/vnc-password-stdin.patch

    Contents of /trunk/vnc/patches/vnc-password-stdin.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 5 months ago) by niro
    File size: 2136 byte(s) 
    -import
    1 --- unix/vncviewer/vncviewer.cxx.102434 2006-12-01 13:37:27.000000000 +0100
    2 +++ unix/vncviewer/vncviewer.cxx 2006-12-01 13:37:27.000000000 +0100
    3 @@ -52,6 +52,7 @@
    4 "manager decoration around a window", 24);
    5 StringParameter passwordFile("PasswordFile",
    6 "Password file for VNC authentication", "");
    7 +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
    8 AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile);
    9
    10 BoolParameter useLocalCursor("UseLocalCursor",
    11 --- unix/vncviewer/vncviewer.man.102434 2006-12-01 13:37:27.000000000 +0100
    12 +++ unix/vncviewer/vncviewer.man 2006-12-01 13:37:27.000000000 +0100
    13 @@ -108,6 +108,11 @@
    14 "~/.vnc/passwd".
    15
    16 .TP
    17 +.B \-passwdInput \fItrue, false\fP
    18 +Force standard vnc dialog to getting password and reads password from stdin.
    19 +Default is false(shows dialog window)
    20 +
    21 +.TP
    22 .B \-Shared
    23 When you make a connection to a VNC server, all other existing connections are
    24 normally closed. This option requests that they be left open, allowing you to
    25 --- unix/vncviewer/parameters.h.102434 2006-12-01 13:37:27.000000000 +0100
    26 +++ unix/vncviewer/parameters.h 2006-12-01 13:37:27.000000000 +0100
    27 @@ -38,6 +38,7 @@
    28 extern rfb::BoolParameter fullScreen;
    29 extern rfb::StringParameter geometry;
    30 extern rfb::StringParameter embedParent;
    31 +extern rfb::BoolParameter passwdInput;
    32
    33 extern char aboutText[];
    34 extern char* programName;
    35 --- unix/vncviewer/CConn.cxx.102434 2006-12-01 13:37:27.000000000 +0100
    36 +++ unix/vncviewer/CConn.cxx 2006-12-01 13:41:42.000000000 +0100
    37 @@ -37,6 +37,8 @@
    38 #include "ServerDialog.h"
    39 #include "PasswdDialog.h"
    40 #include "parameters.h"
    41 +#include <string>
    42 +#include <iostream>
    43
    44 using namespace rfb;
    45
    46 @@ -206,6 +208,15 @@
    47 return;
    48 }
    49
    50 + if(passwdInput)
    51 + {
    52 + std::string s;
    53 + std::cin >> s;
    54 + *password = strdup(s.c_str());
    55 + if(user) *user = 0;
    56 + return;
    57 + }
    58 +
    59 const char* secType = secTypeName(getCurrentCSecurity()->getType());
    60 const char* titlePrefix = "VNC Authentication";
    61 CharArray title(strlen(titlePrefix) + strlen(secType) + 4);