Update of /cvsroot/monetdb/clients/src/java/src/nl/cwi/monetdb/mcl/net
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31067/src/nl/cwi/monetdb/mcl/net
Modified Files:
Tag: Clients_1-18
MapiSocket.java
Log Message:
Merged HEAD into Clients_1-18
Index: MapiSocket.java
===================================================================
RCS file:
/cvsroot/monetdb/clients/src/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- MapiSocket.java 23 Apr 2007 13:28:15 -0000 1.3
+++ MapiSocket.java 16 Aug 2007 10:52:55 -0000 1.3.2.1
@@ -264,7 +264,7 @@
URI u;
try {
- u = new URI(suri.substring(4));
+ u = new URI(suri.substring(5));
} catch (URISyntaxException e) {
throw new
MCLParseException(e.toString());
}
@@ -273,7 +273,7 @@
String warnings =
connect(u.getHost(), p == -1 ? port :
p, user, pass);
if (warnings == null) warnings = "";
- warnings = "Redirect by " + host + ":" +
+ warn += "\nRedirect by " + host + ":" +
port + " to " + suri + "\n" + warnings;
} else {
String msg = "The server sent a redirect for
this connection:";
@@ -318,7 +318,7 @@
// challenge string to use as salt/key
String challenge = chaltok[0];
- // chaltok[1]; // server type, not needed yet
+ String servert = chaltok[1];
try {
version = Integer.parseInt(chaltok[2].trim()); //
protocol version
} catch (NumberFormatException e) {
@@ -341,6 +341,11 @@
// proto 8, the byteorder of the blocks is
always little
// endian because most machines today are.
String hashes = (hash == null ? chaltok[3] :
hash);
+ // if we deal with merovingian, mask our
credentials
+ if (servert.equals("merovingian")) {
+ username = "merovingian";
+ password = "merovingian";
+ }
String pwhash;
if (hashes.indexOf("SHA1") != -1) {
try {
@@ -384,7 +389,7 @@
// generate response
response = "BIG:"; // JVM byte-order is
big-endian
response += username + ":" + pwhash + ":" +
language;
- response += ":" + database + ":";
+ response += ":" + (database == null ? "" :
database) + ":";
return(response);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
