diff options
Diffstat (limited to 'ipa-server')
-rw-r--r-- | ipa-server/ipa-fix-CVE-2008-3274 | 6 | ||||
-rw-r--r-- | ipa-server/ipaserver/installutils.py | 2 | ||||
-rw-r--r-- | ipa-server/ipaserver/krbinstance.py | 2 |
3 files changed, 5 insertions, 5 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) diff --git a/ipa-server/ipaserver/installutils.py b/ipa-server/ipaserver/installutils.py index 563b168e8..aed2fe9ea 100644 --- a/ipa-server/ipaserver/installutils.py +++ b/ipa-server/ipaserver/installutils.py @@ -229,7 +229,7 @@ def set_directive(filename, directive, value): fd.close() def kadmin(command): - ipautil.run(["/usr/kerberos/sbin/kadmin.local", "-q", command]) + ipautil.run(["kadmin.local", "-q", command]) def kadmin_addprinc(principal): kadmin("addprinc -randkey " + principal) diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py index c26228a2d..a7e44c52d 100644 --- a/ipa-server/ipaserver/krbinstance.py +++ b/ipa-server/ipaserver/krbinstance.py @@ -312,7 +312,7 @@ class KrbInstance(service.Service): if not replica: #populate the directory with the realm structure - args = ["/usr/kerberos/sbin/kdb5_ldap_util", "-D", "uid=kdc,cn=sysaccounts,cn=etc,"+self.suffix, "-w", self.kdc_password, "create", "-s", "-P", self.master_password, "-r", self.realm, "-subtrees", self.suffix, "-sscope", "sub"] + args = ["kdb5_ldap_util", "-D", "uid=kdc,cn=sysaccounts,cn=etc,"+self.suffix, "-w", self.kdc_password, "create", "-s", "-P", self.master_password, "-r", self.realm, "-subtrees", self.suffix, "-sscope", "sub"] try: ipautil.run(args) except ipautil.CalledProcessError, e: |