Hi, We should respect already configured options present in /etc/openldap/ldap.conf when generating our own configuration. With this patch, we only rewrite URI, BASE and TLS_CACERT options.
https://fedorahosted.org/freeipa/ticket/3582 Tomas
>From 87646955d8e75495fbb4519aa29e4e35c8dfe32b Mon Sep 17 00:00:00 2001 From: Tomas Babej <tba...@redhat.com> Date: Mon, 22 Apr 2013 12:55:38 +0200 Subject: [PATCH] Preserve already configured options in openldap conf We should respect already configured options present in /etc/openldap/ldap.conf when generating our own configuration. With this patch, we only rewrite URI, BASE and TLS_CACERT options. https://fedorahosted.org/freeipa/ticket/3582 --- ipa-client/ipa-install/ipa-client-install | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 29adc93f3bcb3ccc81c31237af314af0ba61b8c9..2cc1da95d077c597a6dffba39e192c1104348e1b 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -817,16 +817,20 @@ def configure_openldap_conf(fstore, cli_basedn, cli_server): ldapconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer") ldapconf.setOptionAssignment(" ") - opts = [{'name':'comment', 'type':'comment', 'value':'File modified by ipa-client-install'}, + opts = [{'name':'comment', 'type':'comment', + 'value':'File modified by ipa-client-install'}, {'name':'empty', 'type':'empty'}, - {'name':'URI', 'type':'option', 'value':'ldaps://'+ cli_server[0]}, - {'name':'BASE', 'type':'option', 'value':cli_basedn}, - {'name':'TLS_CACERT', 'type':'option', 'value':CACERT}, + {'action':'set', 'name':'URI', 'type':'option', + 'value':'ldaps://'+ cli_server[0]}, + {'action':'set', 'name':'BASE', 'type':'option', + 'value':cli_basedn}, + {'action':'set', 'name':'TLS_CACERT', 'type':'option', + 'value':CACERT}, {'name':'empty', 'type':'empty'}] target_fname = '/etc/openldap/ldap.conf' fstore.backup_file(target_fname) - ldapconf.newConf(target_fname, opts) + ldapconf.changeConf(target_fname, opts) os.chmod(target_fname, 0644) def hardcode_ldap_server(cli_server): -- 1.8.1.4
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
