summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorPavel Zuna <pzuna@redhat.com>2011-03-03 09:05:13 -0500
committerRob Crittenden <rcritten@redhat.com>2011-03-03 14:01:22 -0500
commiteb6b3c7afc4065f12960f09791f2a5b645abef8b (patch)
tree710c458383546440977f3aae5e8b48737e6277ca /ipalib
parent07c896e20471bbc22d3387235660af2b01084bad (diff)
downloadfreeipa-eb6b3c7afc4065f12960f09791f2a5b645abef8b.tar.gz
freeipa-eb6b3c7afc4065f12960f09791f2a5b645abef8b.tar.xz
freeipa-eb6b3c7afc4065f12960f09791f2a5b645abef8b.zip
Fix error in user plugin email normalizer for empty --setattr=email=.
ticket 1048
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/plugins/user.py2
1 files changed, 1 insertions, 1 deletions
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)