summaryrefslogtreecommitdiffstats
path: root/ipa-client
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-05-23 14:51:50 -0400
committerSimo Sorce <ssorce@redhat.com>2008-05-29 09:43:00 -0400
commit53afb67537f6be9712f2cb23fb021d204b5182b0 (patch)
tree788c8f0111b39c9e286034fbd6f73258e850cc13 /ipa-client
parentc5d6ad5c6e971e6663d1ebeb2b558d8a731a9607 (diff)
downloadfreeipa-53afb67537f6be9712f2cb23fb021d204b5182b0.tar.gz
freeipa-53afb67537f6be9712f2cb23fb021d204b5182b0.tar.xz
freeipa-53afb67537f6be9712f2cb23fb021d204b5182b0.zip
Fix the case where domain != lower(REALM)
add the domain to the ipa.conf file for apps that need to know This should fix a bug in the replica setup
Diffstat (limited to 'ipa-client')
-rw-r--r--ipa-client/ipa-install/ipa-client-install29
1 files changed, 16 insertions, 13 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 54d7185a9..17dd15a5d 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -202,23 +202,26 @@ def main():
return 1
# Configure ipa.conf
- ipaconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
- ipaconf.setOptionAssignment(" = ")
- ipaconf.setSectionNameDelimiters(("[","]"))
+ if not options.on_master:
+ ipaconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")
+ ipaconf.setOptionAssignment(" = ")
+ ipaconf.setSectionNameDelimiters(("[","]"))
- opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'},
- {'name':'empty', 'type':'empty'}]
+ opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'},
+ {'name':'empty', 'type':'empty'}]
- #[defaults]
- defopts = [{'name':'server', 'type':'option', 'value':cli_server},
- {'name':'realm', 'type':'option', 'value':cli_realm}]
+ #[defaults]
+ defopts = [{'name':'server', 'type':'option', 'value':cli_server},
+ {'name':'realm', 'type':'option', 'value':cli_realm},
+ {'name':'domain', 'type':'option', 'value':cli_domain}]
- opts.append({'name':'defaults', 'type':'section', 'value':defopts})
- opts.append({'name':'empty', 'type':'empty'})
+ opts.append({'name':'defaults', 'type':'section', 'value':defopts})
+ opts.append({'name':'empty', 'type':'empty'})
+
+ fstore.backup_file("/etc/ipa/ipa.conf")
+ ipaconf.newConf("/etc/ipa/ipa.conf", opts)
+ print "Created /etc/ipa/ipa.conf"
- fstore.backup_file("/etc/ipa/ipa.conf")
- ipaconf.newConf("/etc/ipa/ipa.conf", opts)
- print "Created /etc/ipa/ipa.conf"
# Configure ldap.conf
ldapconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer")