diff options
| author | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-17 14:27:54 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-17 14:27:54 -0700 |
| commit | a0e2fa00f1005bf7d5853c83ff0f567663352e92 (patch) | |
| tree | 9a000cf4db2e32d0217e6a845e086ae8d726a4aa /ipa-server/ipaserver/ipaldap.py | |
| parent | 48bb474e6848f02de2b77a7abf6aed13857267ee (diff) | |
| download | freeipa.git-a0e2fa00f1005bf7d5853c83ff0f567663352e92.tar.gz freeipa.git-a0e2fa00f1005bf7d5853c83ff0f567663352e92.tar.xz freeipa.git-a0e2fa00f1005bf7d5853c83ff0f567663352e92.zip | |
Manual merge changes in for the cidict/ipaclient add_user()
Diffstat (limited to 'ipa-server/ipaserver/ipaldap.py')
| -rw-r--r-- | ipa-server/ipaserver/ipaldap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipa-server/ipaserver/ipaldap.py b/ipa-server/ipaserver/ipaldap.py index 936dd662..a0f1cab4 100644 --- a/ipa-server/ipaserver/ipaldap.py +++ b/ipa-server/ipaserver/ipaldap.py @@ -63,7 +63,7 @@ class Entry: if isinstance(entrydata,tuple): self.dn = entrydata[0] self.data = ldap.cidict.cidict(entrydata[1]) - elif isinstance(entrydata,str): + elif isinstance(entrydata,str) or isinstance(entrydata,unicode): self.dn = entrydata self.data = ldap.cidict.cidict() else: |