From 2930a289773c8c6124971bed66216db91d48c70d Mon Sep 17 00:00:00 2001
From: Jose Castro Leon <jose.castro.leon@cern.ch>
Date: Wed, 6 Feb 2013 16:36:15 +0100
Subject: Tenant update on LDAP breaks if there is no update to apply

Fixes bug 1117362

Change-Id: Ia47f8a7cd38dcaaceafed39cbdd837ba9a67969f
---
 keystone/common/ldap/core.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index e767e93e..0dfca9c8 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.py
@@ -311,8 +311,9 @@ class BaseLdap(object):
                     op = ldap.MOD_REPLACE
                 modlist.append((op, self.attribute_mapping.get(k, k), [v]))
 
-        conn = self.get_connection()
-        conn.modify_s(self._id_to_dn(id), modlist)
+        if modlist:
+            conn = self.get_connection()
+            conn.modify_s(self._id_to_dn(id), modlist)
 
     def delete(self, id):
         if not self.allow_delete:
-- 
cgit