From 99491e46ec818c1cca19ec79a669da958ffcac1d Mon Sep 17 00:00:00 2001
From: Laurens Voerman <l.voerman@rug.nl>
Date: Thu, 12 Oct 2017 17:21:10 +0200
Subject: [PATCH] modified present3D to allow multiple --login arguments like
 osgViewer, added --login option to osgvnc example

---
 applications/present3D/present3D.cpp | 12 ++++--------
 examples/osgvnc/osgvnc.cpp           | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/applications/present3D/present3D.cpp b/applications/present3D/present3D.cpp
index 0e0c6abec..24318d9ec 100644
--- a/applications/present3D/present3D.cpp
+++ b/applications/present3D/present3D.cpp
@@ -336,14 +336,10 @@ int main( int argc, char **argv )
     std::string url, username, password;
     while(arguments.read("--login",url, username, password))
     {
-        if (!osgDB::Registry::instance()->getAuthenticationMap())
-        {
-            osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
-            osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
-                url,
-                new osgDB::AuthenticationDetails(username, password)
-            );
-        }
+        osgDB::Registry::instance()->getOrCreateAuthenticationMap()->addAuthenticationDetails(
+            url,
+            new osgDB::AuthenticationDetails(username, password)
+        );
     }
 
 
diff --git a/examples/osgvnc/osgvnc.cpp b/examples/osgvnc/osgvnc.cpp
index a286b59b0..68f4f0485 100644
--- a/examples/osgvnc/osgvnc.cpp
+++ b/examples/osgvnc/osgvnc.cpp
@@ -37,7 +37,9 @@ class EscapeHandler : public osgGA::GUIEventHandler
 int main(int argc,char** argv)
 {
     osg::ArgumentParser arguments(&argc, argv);
-    osgViewer::Viewer viewer(arguments);
+	arguments.getApplicationUsage()->addCommandLineOption("--login <url> <username> <password>", "Provide authentication information for http file access.");
+	arguments.getApplicationUsage()->addCommandLineOption("--password <password>", "Provide password for any vnc url on command line not mentioned in --login.");
+	osgViewer::Viewer viewer(arguments);
 
     osgWidget::GeometryHints hints(osg::Vec3(0.0f,0.0f,0.0f),
                                    osg::Vec3(1.0f,0.0f,0.0f),
@@ -52,6 +54,15 @@ int main(int argc,char** argv)
     {
     }
 
+	std::string url, username, password;
+	while (arguments.read("--login", url, username, password))
+	{
+		osgDB::Registry::instance()->getOrCreateAuthenticationMap()->addAuthenticationDetails(
+			url,
+			new osgDB::AuthenticationDetails(username, password)
+		);
+	}
+
     for(int i=1; i<arguments.argc(); ++i)
     {
         if (!arguments.isOption(i))
@@ -60,8 +71,12 @@ int main(int argc,char** argv)
 
             if (!password.empty())
             {
-                if (!osgDB::Registry::instance()->getAuthenticationMap()) osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
-                osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(hostname, new osgDB::AuthenticationDetails("", password));
+				const osgDB::AuthenticationMap* authenticationMap = osgDB::Registry::instance()->getOrCreateAuthenticationMap();
+				const osgDB::AuthenticationDetails* details = authenticationMap->getAuthenticationDetails(hostname);
+				if (details == NULL)
+				{
+					authenticationMap->addAuthenticationDetails(hostname, new osgDB::AuthenticationDetails("", password));
+				}
             }
 
             osg::ref_ptr<osgWidget::VncClient> vncClient = new osgWidget::VncClient;