FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #351 from LaurensVoerman/vncHostPw

Browse Source 
VNC: try to find password for host if no password for host:port is found
This commit is contained in:
OpenSceneGraph git repository
2017-10-05 15:57:02 +01:00
committed by GitHub
parent ddf8c68d26 292b892478
commit 19a48951b7
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/osgPlugins/vnc/ReaderWriterVNC.cpp
View File

@@ -397,20 +397,23 @@ class ReaderWriterVNC : public osgDB::ReaderWriter
const osgDB::AuthenticationMap* authenticationMap = (options && options->getAuthenticationMap()) ?
options->getAuthenticationMap() :
osgDB::Registry::instance()->getAuthenticationMap();
if (authenticationMap != NULL) {
const osgDB::AuthenticationDetails* details = authenticationMap->getAuthenticationDetails(hostname);
if (details == NULL) {
size_t pos = hostname.find(":");
if (pos != std::string::npos) {
details = authenticationMap->getAuthenticationDetails(hostname.substr(0, pos));
}
}
// configure authentication if required.
if (details != NULL)
{
OSG_NOTICE << "Passing in password = " << details->password << std::endl;
const osgDB::AuthenticationDetails* details = authenticationMap ?
authenticationMap->getAuthenticationDetails(hostname) :
0;
// configure authentication if required.
if (details)
{
OSG_NOTICE<<"Passing in password = "<<details->password<<std::endl;
image->_username = details->username;
image->_password = details->password;
image->_username = details->username;
image->_password = details->password;
}
}
if (options && !options->getOptionString().empty())
{
image->_optionString = options->getOptionString();