newtigerpatches/add-username-param.patch

   1 Index: new/java/com/tigervnc/vncviewer/CConn.java
   2 ===================================================================
   3 --- new.orig/java/com/tigervnc/vncviewer/CConn.java     2013-04-18 11:56:21.000000000 +0200
   4 +++ new/java/com/tigervnc/vncviewer/CConn.java  2013-04-18 14:23:58.000000000 +0200
   5 @@ -246,6 +246,16 @@
   6      String passwordFileStr = viewer.passwordFile.getValue();
   7      PasswdDialog dlg;
   8
   9 +    String usernameParam = viewer.usernameParam.getValue();
  10 +    String passwordParam = viewer.passwordParam.getValue();
  11 +    vlog.info("USERNAME: " + usernameParam);
  12 +    vlog.info("PASSWORD: " + passwordParam);
  13 +    if (usernameParam != null && passwordParam != null) {
  14 +        user.append(usernameParam);
  15 +        passwd.append(passwordParam);
  16 +        return true;
  17 +    }
  18 +
  19      if (user == null && passwordFileStr != "") {
  20        InputStream fp = null;
  21        try {
  22 Index: new/java/com/tigervnc/vncviewer/VncViewer.java
  23 ===================================================================
  24 --- new.orig/java/com/tigervnc/vncviewer/VncViewer.java 2013-04-18 13:56:33.000000000 +0200
  25 +++ new/java/com/tigervnc/vncviewer/VncViewer.java      2013-04-19 07:52:32.000000000 +0200
  26 @@ -168,6 +168,9 @@
  27      if (firstApplet) {
  28        alwaysShowServerDialog.setParam(true);
  29        Configuration.readAppletParams(this);
  30 +
  31 +      System.err.print(Configuration.listParams());
  32 +
  33        String tmpcert = this.getParameter("PVECert");
  34        if (tmpcert != null) {
  35            CSecurityTLS.PVECert.setParam(tmpcert.replace('|', '\n'));
  36 @@ -263,6 +266,14 @@
  37                            "Password file for VNC authentication", "");
  38    AliasParameter passwd
  39    = new AliasParameter("passwd", "Alias for PasswordFile", passwordFile);
  40 +
  41 +  StringParameter usernameParam
  42 +  = new StringParameter("USERNAME",
  43 +                        "Username for VNC authentication", null);
  44 +  StringParameter passwordParam
  45 +  = new StringParameter("PASSWORD",
  46 +                        "Password for VNC authentication", null);
  47 +
  48    BoolParameter autoSelect
  49    = new BoolParameter("AutoSelect",
  50                            "Auto select pixel format and encoding", true);