From f72e3ee5a92bcb444d467cc4eb94a7e2b83d9c3e Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Mon, 23 Mar 2015 10:43:58 +0100 Subject: [PATCH] posixAccount schema only allows ASCII in gecos, put username there instead --- neuf_ldap/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neuf_ldap/utils.py b/neuf_ldap/utils.py index fe0b85c..16c0c5d 100644 --- a/neuf_ldap/utils.py +++ b/neuf_ldap/utils.py @@ -79,7 +79,7 @@ def create_ldap_user(user, dry_run=False): 'last_name': user['last_name'], 'full_name': full_name, 'display_name': full_name, - 'gecos': full_name, + 'gecos': user['username'], 'email': user['email'], 'username': user['username'], 'id': _get_next_uid(), @@ -131,6 +131,9 @@ def ldap_update_user_details(inside_user, dry_run=False): for attr in diff_attributes: setattr(ldap_user, attr, inside_user[attr]) + if ldap_user.username != inside_user['username']: + ldap_user.gecos = inside_user['username'] + name_changed = inside_user['first_name'] != ldap_user.first_name or inside_user['last_name'] != ldap_user.last_name if name_changed: full_name = '{} {}'.format(inside_user['first_name'], inside_user['last_name']) @@ -139,7 +142,6 @@ def ldap_update_user_details(inside_user, dry_run=False): 'last_name': inside_user['last_name'], 'full_name': full_name, 'display_name': full_name, - 'gecos': full_name, } for key, value in name_data.iteritems(): setattr(ldap_user, key, value)