From c971056768c11ea0e145b6bbcb87ef9b4c614eb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20=C3=85strand?= Date: Fri, 19 May 2006 14:32:59 +0000 Subject: [PATCH] Adapt CConn::getUserPasswd, so that it can read from a file again. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@566 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- vncviewer/CConn.cxx | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx index d141e50c..73597f52 100644 --- a/vncviewer/CConn.cxx +++ b/vncviewer/CConn.cxx @@ -677,20 +677,22 @@ void CConn::copyRect(const Rect& r, int srcX, int srcY) { } void CConn::getUserPasswd(char** user, char** password) { -/* if (!user && options.passwordFile.buf[0]) { FILE* fp = fopen(options.passwordFile.buf, "rb"); - if (!fp) return false; - char data[256]; - int datalen = fread(data, 1, 256, fp); - fclose(fp); - if (datalen != 8) return false; - vncAuthUnobfuscatePasswd(data); - *password = strDup(data); - memset(data, 0, strlen(data)); - return true; + if (fp) { + char data[256]; + int datalen = fread(data, 1, 256, fp); + fclose(fp); + if (datalen == 8) { + ObfuscatedPasswd obfPwd; + obfPwd.buf = data; + obfPwd.length = datalen; + PlainPasswd passwd(obfPwd); + *password = strDup(passwd.buf); + memset(data, 0, strlen(data)); + } + } } -*/ if (user && options.userName.buf) *user = strDup(options.userName.buf); if (password && options.password.buf) -- 2.39.5