diff --git a/gestion/ldap_passwd.py b/gestion/ldap_passwd.py index 5e853e53..300674b0 100644 --- a/gestion/ldap_passwd.py +++ b/gestion/ldap_passwd.py @@ -1,7 +1,7 @@ # -*- coding: iso8859-15 -*- ############################################################################### # ldap_passwd.py : manipulation des mots de passes LDAP -# $Id: ldap_passwd.py,v 1.4 2006-04-28 00:12:40 chove Exp $ +# $Id: ldap_passwd.py,v 1.5 2006-04-28 00:22:37 chove Exp $ ############################################################################### # The authors of this code are # Bjorn Ove Grotan @@ -78,12 +78,15 @@ def getsalt(chars=string.letters+string.digits, length=16): salt += random.choice(chars) return salt -def mkpasswd(pwd, sambaver=3, algo='SSHA', salt=getsalt()): +def mkpasswd(pwd, sambaver=3, algo='SSHA', salt=None): ''' Make a given password cryptated, possibly with different crypt-algorihtms. This module was written for use with LDAP - so default is seeded sha ''' + if salt == None: + salt = getsalt() + algo = algo.lower() if algo not in algos.keys(): raise TypeError, 'Algorithm <%s> not supported in this version.' % algo