From 2d3301ceb7dca44d200d6abc0a2a6dfcce3dd7c2 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Fri, 24 May 2013 14:33:00 +0200 Subject: Avoid exporting KRB5_KTNAME in dirsrv env The variable is already defined, exporting in dirsrv systemd environment is not needed and produces a (benign) error. --- init/systemd/freeipa-systemd-upgrade | 1 - ipaserver/install/krbinstance.py | 1 - 2 files changed, 2 deletions(-) diff --git a/init/systemd/freeipa-systemd-upgrade b/init/systemd/freeipa-systemd-upgrade index 1f1a616bc..7e7c202cf 100755 --- a/init/systemd/freeipa-systemd-upgrade +++ b/init/systemd/freeipa-systemd-upgrade @@ -68,7 +68,6 @@ try: # 2. Upgrade /etc/sysconfig/dirsrv for systemd print " Upgrade /etc/sysconfig/dirsrv" update_key_val_in_file("/etc/sysconfig/dirsrv", "KRB5_KTNAME", "/etc/dirsrv/ds.keytab") - update_key_val_in_file("/etc/sysconfig/dirsrv", "export KRB5_KTNAME", "/etc/dirsrv/ds.keytab") # 3. Upgrade /etc/sysconfig/krb5kdc for systemd print " Upgrade /etc/sysconfig/krb5kdc" replacevars = {'KRB5REALM':config.config.default_realm} diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 6f9f1f5c4..33cd3489d 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -391,7 +391,6 @@ class KrbInstance(service.Service): installutils.create_keytab("/etc/dirsrv/ds.keytab", ldap_principal) update_key_val_in_file("/etc/sysconfig/dirsrv", "KRB5_KTNAME", "/etc/dirsrv/ds.keytab") - update_key_val_in_file("/etc/sysconfig/dirsrv", "export KRB5_KTNAME", "/etc/dirsrv/ds.keytab") pent = pwd.getpwnam(dsinstance.DS_USER) os.chown("/etc/dirsrv/ds.keytab", pent.pw_uid, pent.pw_gid) -- cgit