Changeset: cbe1e2600e04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbe1e2600e04
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (38 lines):
diff -r 81b73aab0357 -r cbe1e2600e04 python/monetdb/mapi2.py
--- a/python/monetdb/mapi2.py Tue Sep 21 12:43:21 2010 +0200
+++ b/python/monetdb/mapi2.py Tue Sep 21 16:45:58 2010 +0200
@@ -25,7 +25,6 @@
import logging
import struct
import hashlib
-import crypt
import platform
from cStringIO import StringIO
@@ -207,6 +206,7 @@
m.update(salt.encode())
pwhash = "{MD5}" + m.hexdigest()
elif "crypt" in h:
+ import crypt
pwhash = "{crypt}" + crypt.crypt((password+salt)[:8], salt[-2:])
else:
pwhash = "{plain}" + password + salt
diff -r 81b73aab0357 -r cbe1e2600e04 python/monetdb/mapi3.py
--- a/python/monetdb/mapi3.py Tue Sep 21 12:43:21 2010 +0200
+++ b/python/monetdb/mapi3.py Tue Sep 21 16:45:58 2010 +0200
@@ -25,7 +25,6 @@
import logging
import struct
import hashlib
-import crypt
import platform
from io import BytesIO
@@ -207,6 +206,7 @@
m.update(salt.encode())
pwhash = "{MD5}" + m.hexdigest()
elif "crypt" in h:
+ import crypt
pwhash = "{crypt}" + crypt.crypt((password+salt)[:8], salt[-2:])
else:
pwhash = "{plain}" + password + salt
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
