summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-09-17 09:45:00 -0400
committerSimo Sorce <ssorce@redhat.com>2008-09-18 17:23:12 -0400
commitf6cd489909dd4cdc799b1cbe85b1c01ab2339c36 (patch)
tree53b6df32f3a947b836aa7316d0dd071e7605948a /ipa-client
parentbc70a5146f9554225539079452e2d62f03c7edf2 (diff)
downloadfreeipa-f6cd489909dd4cdc799b1cbe85b1c01ab2339c36.tar.gz
freeipa-f6cd489909dd4cdc799b1cbe85b1c01ab2339c36.tar.xz
freeipa-f6cd489909dd4cdc799b1cbe85b1c01ab2339c36.zip
We were assuming that, if the realm was correct then also the
rest of the krb5.conf configuration were. This clearly breaks with the default EXAMPLE.COM realm configuratrion. Furthermore it makes it not possible to try to 'fix' an installation by rerruninng ipa-client-install This patch removes the special case and avoids krb5.conf only if the on_master flag is passed. Fix also one inner 'if' statement to be simpler to understand.
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/ipa-install/ipa-client-install15
1 files changed, 6 insertions, 9 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index eec36e4e..cd5bfdde 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -271,11 +271,8 @@ def main():
print "Creation of /etc/ldap.conf: " + str(e)
return 1
- #Check if kerberos is already configured properly
- krbctx = krbV.default_context()
- # If we find our domain assume we are properly configured
- #(ex. we are configuring the client side of a Master)
- if not options.on_master and (not krbctx.default_realm == cli_realm or options.force):
+ #If on master assume kerberos is already configured properly.
+ if not options.on_master:
#Configure krb5.conf
krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
@@ -289,12 +286,12 @@ def main():
#[libdefaults]
libopts = [{'name':'default_realm', 'type':'option', 'value':cli_realm}]
- if dnsok and not options.force and not options.on_master:
- libopts.append({'name':'dns_lookup_realm', 'type':'option', 'value':'true'})
- libopts.append({'name':'dns_lookup_kdc', 'type':'option', 'value':'true'})
- else:
+ if not dnsok or options.force:
libopts.append({'name':'dns_lookup_realm', 'type':'option', 'value':'false'})
libopts.append({'name':'dns_lookup_kdc', 'type':'option', 'value':'false'})
+ else:
+ libopts.append({'name':'dns_lookup_realm', 'type':'option', 'value':'true'})
+ libopts.append({'name':'dns_lookup_kdc', 'type':'option', 'value':'true'})
libopts.append({'name':'ticket_lifetime', 'type':'option', 'value':'24h'})
libopts.append({'name':'forwardable', 'type':'option', 'value':'yes'})