diff options
| author | Simo Sorce <ssorce@redhat.com> | 2011-02-25 18:37:45 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2011-03-01 11:02:55 -0500 |
| commit | 2028695d88cad856d3051abc76fa9254dd3598e2 (patch) | |
| tree | 8afc023649613a644ce5f8e973defae7393d9ebc /ipaserver/install/service.py | |
| parent | 09dd05b49ac8b5bcb0adcc193e9b943be6471f70 (diff) | |
| download | freeipa-2028695d88cad856d3051abc76fa9254dd3598e2.tar.gz freeipa-2028695d88cad856d3051abc76fa9254dd3598e2.tar.xz freeipa-2028695d88cad856d3051abc76fa9254dd3598e2.zip | |
Use wrapper for sasl gssapi binds so it behaves like other binds
By calling directly sasl_interactive_bind_s() we were not calling __lateinit()
This in turn resulted in some variables like dbdir not to be set on the
IPAadmin object.
Keep all bind types in the same place so the same common sbind steps can be
performed in each case.
Related to: https://fedorahosted.org/freeipa/ticket/1022
Diffstat (limited to 'ipaserver/install/service.py')
| -rw-r--r-- | ipaserver/install/service.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 41b221419..ec4855f87 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -31,7 +31,6 @@ import datetime from ipaserver.install import installutils CACERT = "/etc/ipa/ca.crt" -SASL_AUTH = ldap.sasl.sasl({}, 'GSSAPI') SERVICE_LIST = { 'KDC':('krb5kdc', 10), @@ -299,7 +298,7 @@ class Service: if dm_password: conn.do_simple_bind(bindpw=dm_password) else: - conn.sasl_interactive_bind_s('', SASL_AUTH) + conn.do_sasl_gssapi_bind_() except Exception, e: logging.debug("Could not connect to the Directory Server on %s: %s" % (fqdn, str(e))) raise e |