implement username/password from env.

diff --git a/vncviewer/UserDialog.cxx b/vncviewer/UserDialog.cxx
index c3aa2f3646395c81f76280f1cdb33667a396e217..8fa26cf3668d4eaecca95c0c9466103c5cd3fe28 100644 (file)
--- a/vncviewer/UserDialog.cxx
+++ b/vncviewer/UserDialog.cxx
@@ -75,6 +75,19 @@ void UserDialog::getUserPasswd(bool secure, char** user, char** password)
   CharArray passwordFileStr(passwordFile.getData());
 
   assert(password);
+  char *envUsername = getenv("VNC_USERNAME");
+  char *envPassword = getenv("VNC_PASSWORD");
+
+  if(envUsername && envPassword) {
+    *user = strdup(envUsername);
+    *password = strdup(envPassword);
+    return;
+  }
+
+  if (!user && envPassword) {
+    *password = strdup(envPassword);
+    return;
+  }
 
   if (!user && passwordFileStr.buf[0]) {
     ObfuscatedPasswd obfPwd(256);