From 42a295928eae21dd9b797a85ca8f699a357ffbd8 Mon Sep 17 00:00:00 2001
From: chove <none>
Date: Fri, 28 Apr 2006 02:22:37 +0200
Subject: [PATCH] en cas de cration massive de mots de passes, il utilisait
 toujours la meme

salt (ce qui n'est pas gravec en soit... mais bon)

darcs-hash:20060428002237-4ec08-61c60810827e5ab433158e53656e34fa65ac8f5c.gz
---
 gestion/ldap_passwd.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 <bgrotan@grotan.com>
@@ -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