summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-03-07 10:56:49 +0100
committerMartin Kosek <mkosek@redhat.com>2013-03-08 14:47:52 +0100
commit9955ba0714996db7b2b97261d3eb72f281eaa2f6 (patch)
tree41664ce9f9ae4322208bdb35360dc62466836765
parentf423364fa82ff32cb1fe214ddb5f7368cfb346ef (diff)
downloadfreeipa-9955ba0714996db7b2b97261d3eb72f281eaa2f6.tar.gz
freeipa-9955ba0714996db7b2b97261d3eb72f281eaa2f6.tar.xz
freeipa-9955ba0714996db7b2b97261d3eb72f281eaa2f6.zip
Disable schema retrieval and attribute decoding when talking to AD GC.
-rw-r--r--ipaserver/dcerpc.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 4e85dc72d..b8f83e9a4 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -434,7 +434,7 @@ class DomainValidator(object):
Actual search in AD LDAP server, using SASL GSSAPI authentication
Returns LDAP result or None
"""
- conn = IPAdmin(host=host, port=port)
+ conn = IPAdmin(host=host, port=port, no_schema=True, decode_attrs=False)
auth = self.__extract_trusted_auth(info)
if attrs is None:
attrs = []
@@ -450,10 +450,7 @@ class DomainValidator(object):
if basedn is None:
# Use domain root base DN
basedn = DN(*map(lambda p: ('dc', p), info['dns_domain'].split('.')))
- # We don't use conn.getEntry() because it will attempt to fetch schema from GC and that will fail
- filterstr = conn.encode(filter)
- attrlist = conn.encode(attrs)
- entries = conn.conn.conn.search_s(str(basedn), scope, filterstr, attrlist, 0)
+ entries = conn.get_entries(basedn, scope, filter, attrs)
os.environ["KRB5CCNAME"] = old_ccache
return entries