diff options
Diffstat (limited to 'ipa-server/ipaserver')
| -rw-r--r-- | ipa-server/ipaserver/dsinstance.py | 6 | ||||
| -rw-r--r-- | ipa-server/ipaserver/krbinstance.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 5c59cfa7..30691115 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -214,7 +214,11 @@ class DsInstance: def change_admin_password(self, password): logging.debug("Changing admin password") dirname = self.config_dirname() - args = ["/usr/lib/mozldap/ldappasswd", + if dir_exists("/usr/lib64/mozldap"): + app = "/usr/lib64/mozldap/ldappasswd" + else: + app = "/usr/lib/mozldap/ldappasswd" + args = [app, "-D", "cn=Directory Manager", "-w", self.dm_password, "-P", dirname+"/cert8.db", "-ZZZ", "-s", password, "uid=admin,cn=sysaccounts,cn=etc,"+self.suffix] diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py index be70b035..03bc9200 100644 --- a/ipa-server/ipaserver/krbinstance.py +++ b/ipa-server/ipaserver/krbinstance.py @@ -202,7 +202,7 @@ class KrbInstance: def __create_ds_keytab(self): try: os.remove("/etc/dirsrv/ds.keytab") - except os.OSError: + except os.error : print "Failed to remove /etc/dirsrv/ds.keytab." (kwrite, kread, kerr) = os.popen3("/usr/kerberos/sbin/kadmin.local") kwrite.write("addprinc -randkey ldap/"+self.fqdn+"@"+self.realm+"\n") @@ -257,7 +257,7 @@ class KrbInstance: def __create_http_keytab(self): try: os.remove("/etc/httpd/conf/ipa.keytab") - except os.OSError: + except os.error: print "Failed to remove /etc/httpd/conf/ipa.keytab." (kwrite, kread, kerr) = os.popen3("/usr/kerberos/sbin/kadmin.local") kwrite.write("addprinc -randkey HTTP/"+self.fqdn+"@"+self.realm+"\n") |