From: Felix Schumacher Date: Fri, 7 Mar 2014 21:05:07 +0000 (+0100) Subject: jcifs-1.3.18b from tgz X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c17d1e6d9973168a58317ee42fe6753cff0c45bf;p=jcifs_without_docs.git jcifs-1.3.18b from tgz Sat Jan 28 13:46:42 EST 2012 jcifs-1.3.18b A logical check has been added to prevent a NullPointerException. --- diff --git a/README.txt b/README.txt index 0904d87..afaf8c8 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +1,8 @@ +Sat Jan 28 13:46:42 EST 2012 +jcifs-1.3.18b + +A logical check has been added to prevent a NullPointerException. + Tue Oct 18 15:10:23 EDT 2011 jcifs-1.3.17 diff --git a/build.xml b/build.xml index ad5b2b6..6126322 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - - + + diff --git a/examples/10883563.doc b/examples/10883563.doc index 62644d9..c67d428 100644 --- a/examples/10883563.doc +++ b/examples/10883563.doc @@ -1,6 +1,6 @@ -C:\tmp>ktpass /princ HTTP/www.foo.net@WIN.NET /ptype KRB5_NT_PRINCIPAL /desonly /pass asj7j112233hh4455 /mapuser test2 -Targeting domain controller: ts0.win.net -Using legacy password setting method -Successfully mapped HTTP/www.foo.net to test2. -Key created. +C:\tmp>ktpass /princ HTTP/www.foo.net@WIN.NET /ptype KRB5_NT_PRINCIPAL /desonly /pass asj7j112233hh4455 /mapuser test2 +Targeting domain controller: ts0.win.net +Using legacy password setting method +Successfully mapped HTTP/www.foo.net to test2. +Key created. Account test2 has been set for DES-only encryption. \ No newline at end of file diff --git a/src/jcifs/dcerpc/DcerpcBinding.java b/src/jcifs/dcerpc/DcerpcBinding.java index 3405ffc..6388f41 100644 --- a/src/jcifs/dcerpc/DcerpcBinding.java +++ b/src/jcifs/dcerpc/DcerpcBinding.java @@ -56,9 +56,10 @@ public class DcerpcBinding { void setOption(String key, Object val) throws DcerpcException { if (key.equals("endpoint")) { - endpoint = val.toString().toLowerCase(); - if (endpoint.startsWith("\\pipe\\")) { - String iface = (String)INTERFACES.get(endpoint.substring(6)); + endpoint = val.toString(); + String lep = endpoint.toLowerCase(); + if (lep.toLowerCase().startsWith("\\pipe\\")) { + String iface = (String)INTERFACES.get(lep.toLowerCase().substring(6)); if (iface != null) { int c, p; c = iface.indexOf(':'); diff --git a/src/jcifs/smb/SmbFile.java b/src/jcifs/smb/SmbFile.java index 627df4b..112d3e6 100644 --- a/src/jcifs/smb/SmbFile.java +++ b/src/jcifs/smb/SmbFile.java @@ -48,7 +48,7 @@ import java.util.Date; * directory. SmbFile URLs have the following syntax: * *
- *     smb://[[[domain;]username[:password]@]server[:port]/[[share/[dir/]file]]][?[param=value[param2=value2[...]]]
+ *     smb://[[[domain;]username[:password]@]server[:port]/[[share/[dir/]file]]][?param=value[param2=value2[...]]]
  * 
* * This example: @@ -939,9 +939,12 @@ int addressIndex; * URLConnection implementation of connect(). */ public void connect() throws IOException { - SmbTransport trans; - SmbSession ssn; - UniAddress addr; + if (isConnected() && tree.session.transport.tconHostName == null) { + /* Tree thinks it is connected but transport disconnected + * under it, reset tree to reflect the truth. + */ + tree.treeDisconnect(true); + } if( isConnected() ) { return;