From bf304533ce4dd003c451580323a6588e4d80b440 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 8 Nov 2010 14:09:04 -0500 Subject: Use PATH in env when running commands to find binaries. Fedora 14 moved the kerberos binaries from /usr/kerberos/[s]bin to /usr/[s]bin. Pass PATH to the environment in ipautil.run() so we can work universally across distributions. Bug 650725 --- ipa-admintools/ipa-change-master-key | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipa-admintools') diff --git a/ipa-admintools/ipa-change-master-key b/ipa-admintools/ipa-change-master-key index a4e943992..0c669cc18 100644 --- a/ipa-admintools/ipa-change-master-key +++ b/ipa-admintools/ipa-change-master-key @@ -223,7 +223,7 @@ def main(): os.environ['KRB5_CONFIG'] = ourkrb5conf #Backup the kerberos key material for recovery if needed - args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", backupfile] + args = ["kdb5_util", "dump", "-verbose", backupfile] print "Performing safety backup of the key material" try: output = ipa.ipautil.run(args) @@ -239,7 +239,7 @@ def main(): print "" #Convert the kerberos keys to the new master key - args = ["/usr/kerberos/sbin/kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile] + args = ["kdb5_util", "dump", "-verbose", "-new_mkey_file", newstashfile, convertfile] print "Converting key material to new master key" try: output = ipa.ipautil.run(args) @@ -302,7 +302,7 @@ def main(): print "A backup copy of the old stash file should be saved in "+bkpstashfile #Finally upload the converted principals - args = ["/usr/kerberos/sbin/kdb5_util", "load", "-verbose", "-update", convertfile] + args = ["kdb5_util", "load", "-verbose", "-update", convertfile] print "Uploading converted key material" try: output = ipa.ipautil.run(args) -- cgit