diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-03-19 08:57:18 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-20 09:24:48 +0100 |
| commit | dda3cd1b1c94c764d774110789dff8899ff873c8 (patch) | |
| tree | d4d0bd12bc52bfb74a0a8a834499c78bfc48e5b4 | |
| parent | 0b64cfd15437df6a3ce71ad8b169615dbe88db54 (diff) | |
| download | freeipa.git-dda3cd1b1c94c764d774110789dff8899ff873c8.tar.gz freeipa.git-dda3cd1b1c94c764d774110789dff8899ff873c8.tar.xz freeipa.git-dda3cd1b1c94c764d774110789dff8899ff873c8.zip | |
ipa-client discovery with anonymous access off
When RootDSE could be read (nsslapd-allow-anonymous-access set to
"rootdse"), autodiscovery module failed to report success to the
client installer.
Remove faulty "verified_servers" flag from autodiscovery module as
it has no point since we consider both scenarios (IPA server with
anonymous access on and unknown LDAP server with anonymous access
off) as success.
https://fedorahosted.org/freeipa/ticket/3519
| -rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index c0c61fb1..b1fb98c9 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -236,7 +236,6 @@ class IPADiscovery(object): ldapaccess = True root_logger.debug("[LDAP server check]") valid_servers = [] - verified_servers = False # is at least one server valid? for server in servers: root_logger.debug('Verifying that %s (realm %s) is an IPA server', server, self.realm) @@ -251,7 +250,6 @@ class IPADiscovery(object): valid_servers.append(server) # verified, we actually talked to the remote server and it # is definetely an IPA server - verified_servers = True if autodiscovered: # No need to keep verifying servers if we discovered them # via DNS @@ -287,14 +285,12 @@ class IPADiscovery(object): self.realm_source = 'Assumed same as domain' root_logger.debug( "Assuming realm is the same as domain: %s", self.realm) - verified_servers = True if not ldapaccess and self.basedn is None: # Generate suffix from realm self.basedn = realm_to_suffix(self.realm) self.basedn_source = 'Generated from Kerberos realm' root_logger.debug("Generated basedn from realm: %s" % self.basedn) - verified_servers = True root_logger.debug( "Discovery result: %s; server=%s, domain=%s, kdc=%s, basedn=%s", @@ -306,7 +302,7 @@ class IPADiscovery(object): # If we have any servers left then override the last return value # to indicate success. - if verified_servers: + if valid_servers: self.server = servers[0] ldapret[0] = 0 |