[Zope-Checkins] CVS: Zope - zpasswd.py:1.15.10.1

[Matt Behrens]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv18366

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	zpasswd.py 
Log Message:
Merge in HEAD (except setup.py... gotta chat about that one) :-)


=== Zope/zpasswd.py 1.15 => 1.15.10.1 ===
 Please choose a format from:
 
-SHA - SHA-1 hashed password
+SHA - SHA-1 hashed password (default)
 CRYPT - UNIX-style crypt password
-CLEARTEXT - no protection.
+CLEARTEXT - no protection
 """
                 encoding = raw_input("Encoding: ")
-                if encoding != '':
+                if encoding == '':
+                    encoding = 'SHA'
+                    break
+                if encoding.upper() in ['SHA', 'CRYPT', 'CLEARTEXT']:
                     break
 
             domains = raw_input("Domain restrictions: ")