2 files changed, 19 insertions, 1 deletions
diff --git a/ipa-python/entity.py b/ipa-python/entity.py
index a5aa33ca..64db350b 100644
--- a/ipa-python/entity.py
+++ b/ipa-python/entity.py
@@ -19,6 +19,7 @@ import ldap
 import ldif
 import re
 import cStringIO
+import copy
 
 import ipa.ipautil
 
@@ -33,6 +34,13 @@ def utf8_encode_values(values):
     else:
         return utf8_encode_value(values)
 
+def copy_CIDict(x):
+    """Do a deep copy of a CIDict"""
+    y = {}
+    for key, value in x.iteritems():
+        y[copy.deepcopy(key)] = copy.deepcopy(value)
+    return y
+
 class Entity:
     """This class represents an IPA user.  An LDAP entry consists of a DN
     and a list of attributes.  Each attribute consists of a name and a list of
@@ -63,7 +71,7 @@ class Entity:
             self.dn = ''
             self.data = ipa.ipautil.CIDict()
 
-        self.orig_data = ipa.ipautil.CIDict(self.data)
+        self.orig_data = ipa.ipautil.CIDict(copy_CIDict(self.data))
 
     def __nonzero__(self):
         """This allows us to do tests like if entry: returns false if there is no data,
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 649a3f20..780fef3d 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -36,6 +36,7 @@ from types import *
 import re
 import xmlrpclib
 import datetime
+from ipa import config
 try:
     from subprocess import CalledProcessError
     class CalledProcessError(subprocess.CalledProcessError):
@@ -53,6 +54,15 @@ except ImportError:
         def __str__(self):
             return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
 
+def get_domain_name():
+    try:
+        config.init_config()
+        domain_name = config.config.get_domain()
+    except Exception, e:
+        return None
+
+    return domain_name
+
 def realm_to_suffix(realm_name):
     s = realm_name.split(".")
     terms = ["dc=" + x.lower() for x in s]