summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-12-05 09:22:00 -0500
committerSimo Sorce <ssorce@redhat.com>2009-01-26 14:44:34 -0500
commit0fb3f394a5c74b779ba7e3d44d2c5a8d85d7f0ea (patch)
treeedafb8b3cb8d16d295981ea9159883f1b61295c9
parentc2967a675a288e7d31374229fd974d0cb9966f2c (diff)
downloadfreeipa-0fb3f394a5c74b779ba7e3d44d2c5a8d85d7f0ea.tar.gz
freeipa-0fb3f394a5c74b779ba7e3d44d2c5a8d85d7f0ea.tar.xz
freeipa-0fb3f394a5c74b779ba7e3d44d2c5a8d85d7f0ea.zip
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.
-rwxr-xr-xipa-server/ipa-compat-manage4
-rwxr-xr-xipa-server/ipa-ldap-updater4
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()