Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap-cgi

diff --git a/debian/changelog b/debian/changelog
index 322a044..6a6bdf2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap-cgi (0.3.XX) Xnstable; urgency=low
+
+  * password-qualify-check: Only import cracklib (do not fallback to crack).
+    Also makes setting cracklib.min_length actually work
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 21 Jul 2010 14:37:57 +0200
+
 userdir-ldap-cgi (0.3.31) unstable; urgency=low
 
   [ Stephen Gran ]

diff --git a/password-qualify-check b/password-qualify-check
index 8853f46..ccecd60 100755 (executable)
--- a/password-qualify-check
+++ b/password-qualify-check
@@ -7,10 +7,7 @@
 # Copyright (c) 2008 Peter Palfrader
 
 import sys, tempfile, os
-try:
-  import crack as cracklib
-except ImportError:
-  import cracklib
+import cracklib
 
 def cleanup(dir):
   if not dir.startswith('/tmp/pwcheck-'):