summaryrefslogtreecommitdiffstats
path: root/ipa_server/ipaldap.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-10-04 01:50:59 -0400
committerRob Crittenden <rcritten@redhat.com>2008-10-04 01:50:59 -0400
commit7e4b0a072e69351496010d7b2151c9b434c8fdb0 (patch)
tree334c035cd46ce882fee05a8beed53c0e7c4cb127 /ipa_server/ipaldap.py
parent3ffbaac64cc3a9ab704c707112f59e041986576c (diff)
downloadfreeipa-7e4b0a072e69351496010d7b2151c9b434c8fdb0.tar.gz
freeipa-7e4b0a072e69351496010d7b2151c9b434c8fdb0.tar.xz
freeipa-7e4b0a072e69351496010d7b2151c9b434c8fdb0.zip
Implement user-find and user-add backend functions so they work over XML-RPC
Change port to 8880 to not conflict with a running IPA v1 instance Encode incoming values from unicode as utf-8 before sending to LDAP
Diffstat (limited to 'ipa_server/ipaldap.py')
-rw-r--r--ipa_server/ipaldap.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py
index c1d134a00..07b207dc5 100644
--- a/ipa_server/ipaldap.py
+++ b/ipa_server/ipaldap.py
@@ -33,7 +33,8 @@ import struct
import ldap.sasl
from ldap.controls import LDAPControl,DecodeControlTuples,EncodeControlTuples
from ldap.ldapobject import SimpleLDAPObject
-import ipautil
+from ipa_server import ipautil
+
# Global variable to define SASL auth
sasl_auth = ldap.sasl.sasl({},'GSSAPI')
@@ -108,7 +109,11 @@ class Entry:
"""Convert the attrs and values to a list of 2-tuples. The first element
of the tuple is the attribute name. The second element is either a
single value or a list of values."""
- return self.data.items()
+ r = []
+ for i in self.data.iteritems():
+ n = ipautil.utf8_encode_values(i[1])
+ r.append((i[0], n))
+ return r
def __str__(self):
"""Convert the Entry to its LDIF representation"""