diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-07-03 17:37:22 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-07-10 10:45:39 +0200 |
| commit | 29fd982f7f3bf4b94a8420fdfb307ed9c43c515c (patch) | |
| tree | 065b4e2e3184311cdc13008f0ad658afdaf9382a /ipa-client/ipaclient/ipadiscovery.py | |
| parent | 5ba8eeb970a8a72ec189e80e369bb7f70091e409 (diff) | |
| download | freeipa-29fd982f7f3bf4b94a8420fdfb307ed9c43c515c.tar.gz freeipa-29fd982f7f3bf4b94a8420fdfb307ed9c43c515c.tar.xz freeipa-29fd982f7f3bf4b94a8420fdfb307ed9c43c515c.zip | |
Make client server option multi-valued, allow disabling DNS discovery
Let the --server option be specified multiple times on the command line.
The first one passed in is the one we enroll against.
Do additional verification before setting dnsok so we can be sure that
the record(s) were actually discovered in DNS.
If servers are provided on the CLI and --fixed-primary is set then
_srv_ is not added to ipa_server in sssd.conf.
https://fedorahosted.org/freeipa/ticket/2841
Diffstat (limited to 'ipa-client/ipaclient/ipadiscovery.py')
| -rw-r--r-- | ipa-client/ipaclient/ipadiscovery.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py index f8c8b5c6d..ca13d9c19 100644 --- a/ipa-client/ipaclient/ipadiscovery.py +++ b/ipa-client/ipaclient/ipadiscovery.py @@ -141,6 +141,9 @@ class IPADiscovery(object): 'Starting IPA discovery with domain=%s, server=%s, hostname=%s', domain, server, hostname) + if type(server) in (list, tuple): + server = server[0] + if not server: if not domain: #domain not provided do full DNS discovery |