From eb6b3c7afc4065f12960f09791f2a5b645abef8b Mon Sep 17 00:00:00 2001
From: Pavel Zuna <pzuna@redhat.com>
Date: Thu, 3 Mar 2011 09:05:13 -0500
Subject: Fix error in user plugin email normalizer for empty --setattr=email=.

ticket 1048
---
 ipalib/plugins/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index aedcf446..4a023ced 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -235,7 +235,7 @@ class user(LDAPObject):
             if not isinstance(email, (list, tuple)):
                 email = [email]
             for m in email:
-                if m.find('@') == -1:
+                if isinstance(m, basestring) and m.find('@') == -1:
                     norm_email.append(m + u'@' + config['ipadefaultemaildomain'][0])
                 else:
                     norm_email.append(m)
-- 
cgit