Use PATH in env when running commands to find binaries.ipa-1-2

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

1 files changed, 3 insertions, 3 deletions

diff --git a/ipa-server/ipa-fix-CVE-2008-3274 b/ipa-server/ipa-fix-CVE-2008-3274
index 41d3abc96..ce8c5e143 100644
--- a/ipa-server/ipa-fix-CVE-2008-3274
+++ b/ipa-server/ipa-fix-CVE-2008-3274
@@ -236,7 +236,7 @@ def change_mkey(password = None, quiet = False):
     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)
@@ -252,7 +252,7 @@ def change_mkey(password = None, quiet = False):
         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)
@@ -315,7 +315,7 @@ def change_mkey(password = None, quiet = False):
         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)