jcifs-1.3.5 from tgz

Wed Mar 11 20:22:46 EDT 2009
jcifs-1.3.5

Stand-alone DFS did not work with an IP address as opposed to a DNS or
NetBIOS hostname. This issue has been fixed.

diff --git a/README.txt b/README.txt
index fbce788..73a3ade 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,9 @@
+Wed Mar 11 20:22:46 EDT 2009
+jcifs-1.3.5
+
+Stand-alone DFS did not work with an IP address as opposed to a DNS or
+NetBIOS hostname. This issue has been fixed.
+
 Sun Mar  9 11:46:15 EDT 2009
 jcifs-1.3.4
 

diff --git a/build.xml b/build.xml
index 967250b..61933a0 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project name="jcifs" default="usage" basedir=".">
 
-    <property name="version" value="1.3.4"/>
-    <property name="reldate" value="Mar 7, 2009"/>
+    <property name="version" value="1.3.5"/>
+    <property name="reldate" value="Mar 12, 2009"/>
 
     <target name="usage">
         <echo>

diff --git a/examples/runtests.sh b/examples/runtests.sh
index 65239a7..7d03375 100644 (file)
--- a/examples/runtests.sh
+++ b/examples/runtests.sh
@@ -6,23 +6,26 @@ CLASSPATH=../build:.
 PROPERTIES=../../user2.prp
 RUN="${JAVA_HOME}/bin/java -cp ${CLASSPATH} -Djcifs.properties=${PROPERTIES}"
 
+#SERVER=192.168.2.110
 #SERVER=dc1.w.net
 #SHARE=tmp
 #DIR=test
 
 # Domain-based DFS
-SERVER=w.net
-SHARE=root2
-DIR=link2/test
+#SERVER=192.168.2.110
+#SERVER=w.net
+#SHARE=root2
+#DIR=link2/test
 
 # smb://fs1.w.net/DFSStandaloneRoot/DFSStandaloneLink/test/
 # smb://dc1.w.net/root2/link2/test/
 # smb://dc1.w.net/tmp/test/
 # smb://dc3.x.net/tmp/test/
 # Stand-alone DFS
-#SERVER=dc3.x.net
-#SHARE=tmp
-#DIR=test
+SERVER=192.168.2.113
+#SERVER=fs1.w.net
+SHARE=DFSStandaloneRoot
+DIR=DFSStandaloneLink/test
 
 WRITE_DIR=${DIR}/
 SRC_DIR=${DIR}/Junk

diff --git a/src/jcifs/smb/SmbFile.java b/src/jcifs/smb/SmbFile.java
index 9e0480f..8b4adf0 100644 (file)
--- a/src/jcifs/smb/SmbFile.java
+++ b/src/jcifs/smb/SmbFile.java
@@ -662,9 +662,9 @@ public class SmbFile extends URLConnection implements SmbConstants {
     }
     void resolveDfs(ServerMessageBlock request) throws SmbException {
         connect0();
-        String hostName = getServerWithDfs();
+
         DfsReferral dr = dfs.resolve(
-                    hostName,
+                    tree.session.transport.tconHostName,
                     tree.share,
                     unc,
                     auth);
@@ -689,7 +689,7 @@ public class SmbFile extends URLConnection implements SmbConstants {
              * clauses are ncessary to prevent exceptions
              */
             if (dr.pathConsumed < 0) {
-                dr.pathConsumed =0 ;
+                dr.pathConsumed = 0;
             } else if (dr.pathConsumed > unc.length()) {
                 dr.pathConsumed = unc.length();
             }