We use the server name for hostname matching in X.509 code. Otherwise certificate wouldn't match hostname. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4249 3789f03b-4d11-0410-bbf8-ca57d06f2519tags/v1.0.90
@@ -116,7 +116,7 @@ CConn::CConn(Display* dpy_, int argc_, char** argv_, network::Socket* sock_, | |||
sameMachine = sock->sameMachine(); | |||
sock->inStream().setBlockCallback(this); | |||
setServerName(sock->getPeerEndpoint()); | |||
setServerName(serverHost); | |||
setStreams(&sock->inStream(), &sock->outStream()); | |||
initialiseProtocol(); | |||
} |
@@ -90,9 +90,10 @@ CConn::~CConn() { | |||
bool CConn::initialise(network::Socket* s, bool reverse) { | |||
// Set the server's name for MRU purposes | |||
CharArray endpoint(s->getPeerEndpoint()); | |||
setServerName(endpoint.buf); | |||
if (!options.host.buf) | |||
options.setHost(endpoint.buf); | |||
setServerName(options.host.buf); | |||
// Initialise the underlying CConnection | |||
setStreams(&s->inStream(), &s->outStream()); |