Changeset: 783f3d7fdb13 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=783f3d7fdb13
Modified Files:
        java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
Branch: Dec2011
Log Message:

getPasswordChallenge: only masquerade credentials selectively

if merovingian is the actual recipient of the login, don't zap
credentials, or we'll never be able to login


diffs (14 lines):

diff --git a/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java 
b/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
--- a/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
+++ b/java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
@@ -490,7 +490,9 @@ public final class MapiSocket {
                                // 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")) {
+                               if (servert.equals("merovingian") &&
+                                               !language.equals("control"))
+                               {
                                        username = "merovingian";
                                        password = "merovingian";
                                }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to