From 4b941b8db26ac66fb2d23ce024d041c375b1afa1 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Fri, 14 Oct 2016 14:27:48 +0000
Subject: [PATCH] more logging updates for easier troubleshooting
---
src/python/dm/common/utility/ldapUserManager.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/common/utility/ldapUserManager.py b/src/python/dm/common/utility/ldapUserManager.py
index 370d332b..3418174c 100755
--- a/src/python/dm/common/utility/ldapUserManager.py
+++ b/src/python/dm/common/utility/ldapUserManager.py
@@ -122,6 +122,11 @@ class LdapUserManager(LdapClient):
ldapUserInfo = self.getUserInfo(username)
userDn = ldapUserInfo.get('userDn')
userAttrs = ldapUserInfo.get('userAttrs')
+
+ # Remove internal LDAP attributes before creating copy for modifications
+ for key in [ 'modifyTimestamp', 'createTimeStamp' ]:
+ if userAttrs.has_key(key):
+ del userAttrs[key]
userAttrs2 = copy.copy(userAttrs)
middleName = attrDict.get('middleName', '')
@@ -151,8 +156,8 @@ class LdapUserManager(LdapClient):
if passwordHash:
userAttrs2['userPassword'] = [self.encodePasswordHash(passwordHash)]
#logger.debug('Encoded password entry: %s' % passwordHash)
- logger.debug('Modifying user %s with attrs %s' % (username, userAttrs2))
-
+ logger.debug('Old user %s attrs: %s' % (username, userAttrs))
+ logger.debug('Modified user %s attrs: %s' % (username, userAttrs2))
userLdif = ldap.modlist.modifyModlist(userAttrs, userAttrs2)
ldapClient.modify_s(userDn, userLdif)
return LdapUserInfo({'userDn' : userDn, 'userAttrs' : userAttrs2})
--
GitLab