You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/03/22 22:46:05 UTC
svn commit: r1460014 - in /manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink: LLSERVER.java LivelinkAuthority.java LivelinkConnector.java

Author: kwright
Date: Fri Mar 22 21:46:04 2013
New Revision: 1460014

URL: http://svn.apache.org/r1460014
Log:
Don't supply credentials unless specified

Modified:
    manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
    manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
    manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java

Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java?rev=1460014&r1=1460013&r2=1460014&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LLSERVER.java Fri Mar 22 21:46:04 2013
@@ -85,7 +85,6 @@ public class LLSERVER
   {
     try
     {
-    
       LLValue configuration;
 
       if (useHttp)
@@ -93,7 +92,7 @@ public class LLSERVER
         boolean useNTLM;
         String userNameAndDomain;
 
-        if (httpNtlmDomain != null)
+        if (httpNtlmDomain != null && httpNtlmUser != null)
         {
           useNTLM = true;
           userNameAndDomain = httpNtlmUser + "@" + httpNtlmDomain;
@@ -107,7 +106,7 @@ public class LLSERVER
         configuration.setAssoc();
         configuration.add("Encoding","UTF-8");
         configuration.add("LivelinkCGI", httpCgiPath);
-        if (userNameAndDomain != null && userNameAndDomain.length() > 0)
+        if (userNameAndDomain != null)
         {
           configuration.add("HTTPUserName", userNameAndDomain);
           configuration.add("HTTPPassword", httpNtlmPassword);

Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1460014&r1=1460013&r2=1460014&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Fri Mar 22 21:46:04 2013
@@ -167,18 +167,12 @@ public class LivelinkAuthority extends o
         
       if (serverHTTPNTLMDomain != null && serverHTTPNTLMDomain.length() == 0)
         serverHTTPNTLMDomain = null;
+      if (serverHTTPNTLMDomain != null && serverHTTPNTLMDomain.length() == 0)
+        serverHTTPNTLMDomain = null;
       if (serverHTTPNTLMUsername == null || serverHTTPNTLMUsername.length() == 0)
       {
-        serverHTTPNTLMUsername = serverUsername;
-        if (serverHTTPNTLMPassword == null || serverHTTPNTLMPassword.length() == 0)
-          serverHTTPNTLMPassword = serverPassword;
-      }
-      else
-      {
-        if (serverHTTPNTLMUsername == null)
-          serverHTTPNTLMUsername = "";
-        if (serverHTTPNTLMPassword == null)
-          serverHTTPNTLMPassword = "";
+        serverHTTPNTLMUsername = null;
+        serverHTTPNTLMPassword = null;
       }
 
       // Set up server ssl if indicated

Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1460014&r1=1460013&r2=1460014&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Fri Mar 22 21:46:04 2013
@@ -422,16 +422,8 @@ public class LivelinkConnector extends o
         serverHTTPNTLMDomain = null;
       if (serverHTTPNTLMUsername == null || serverHTTPNTLMUsername.length() == 0)
       {
-        serverHTTPNTLMUsername = serverUsername;
-        if (serverHTTPNTLMPassword == null || serverHTTPNTLMPassword.length() == 0)
-          serverHTTPNTLMPassword = serverPassword;
-      }
-      else
-      {
-        if (serverHTTPNTLMUsername == null)
-          serverHTTPNTLMUsername = "";
-        if (serverHTTPNTLMPassword == null)
-          serverHTTPNTLMPassword = "";
+        serverHTTPNTLMUsername = null;
+        serverHTTPNTLMPassword = null;
       }
 
       // Set up connection manager