From f61aebd21a8ee6040da310656aaf6335b8b74e76 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Mon, 26 Oct 2015 15:36:27 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20si=20jamais=20le=20canonical=20alias=20es?=
 =?UTF-8?q?t=20deja=20pris,=20calias=20=3D=20login=20+=20u'@crans.org'=20e?=
 =?UTF-8?q?t=20si=20jamais=20le=20mdp=20n'est=20pas=20pr=C3=A9cis=C3=A9=20?=
 =?UTF-8?q?=C3=A0=20la=20fonction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 objets.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/objets.py b/objets.py
index cc7494e..0e95dd8 100644
--- a/objets.py
+++ b/objets.py
@@ -969,11 +969,14 @@ class proprio(CransLdapObject):
             self['mail'] = [login + u"@crans.org"]
             calias = crans_utils.strip_spaces(fn) + u'.' + crans_utils.strip_spaces(ln) + '@crans.org'
             if crans_utils.mailexist(calias):
-                calias = login
+                calias = login + u'@crans.org'
+                if crans_utils.mailexist(calias):
+                    raise ValueError('Creation impossible, Alias canonique déjà pris, merci de choisir un autre login')
             self['canonicalAlias'] = [calias]
             self['cn'] = [fn + u' ' + ln]
             self['loginShell'] = [unicode(shell)]
-            self['userPassword'] = [unicode(hash_pass)]
+            if hash_pass:
+                self['userPassword'] = [unicode(hash_pass)]
             self["solde"] = 0.0
 
             if uidNumber: