From 0fb3f394a5c74b779ba7e3d44d2c5a8d85d7f0ea Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 5 Dec 2008 09:22:00 -0500 Subject: [PATCH] read_file() was a remnant of the conversion of ldapupdate.py to a library and is not accessible directly. Use ipautil.template_file, this works. --- ipa-server/ipa-compat-manage | 4 ++-- ipa-server/ipa-ldap-updater | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ipa-server/ipa-compat-manage b/ipa-server/ipa-compat-manage index f105f1cd1..648e2c3ab 100755 --- a/ipa-server/ipa-compat-manage +++ b/ipa-server/ipa-compat-manage @@ -89,8 +89,8 @@ def main(): dirman_password = "" if options.password: - pw = read_file(options.password) - dirman_password = pw[0].strip() + pw = ipautil.template_file(options.password, []) + dirman_password = pw.strip() else: dirman_password = get_dirman_password() diff --git a/ipa-server/ipa-ldap-updater b/ipa-server/ipa-ldap-updater index f85148e35..28fb1a172 100755 --- a/ipa-server/ipa-ldap-updater +++ b/ipa-server/ipa-ldap-updater @@ -86,8 +86,8 @@ def main(): dirman_password = "" if options.password: - pw = read_file(options.password) - dirman_password = pw[0].strip() + pw = ipautil.template_file(options.password, []) + dirman_password = pw.strip() else: dirman_password = get_dirman_password()