summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipaserver/krbinstance.py
diff options
context:
space:
mode:
authorKarl MacMillan <kmacmill@redhat.com>2007-10-09 16:25:38 -0400
committerKarl MacMillan <kmacmill@redhat.com>2007-10-09 16:25:38 -0400
commitd2a19b200912fe4a78211a3d6212b143ece5e064 (patch)
treef6a07686c2a4b4cb82d288d8ce8a14a454d9776e /ipa-server/ipaserver/krbinstance.py
parentaaa992b74405f41e2f51d1fb2946c57303c3de07 (diff)
downloadfreeipa.git-d2a19b200912fe4a78211a3d6212b143ece5e064.tar.gz
freeipa.git-d2a19b200912fe4a78211a3d6212b143ece5e064.tar.xz
freeipa.git-d2a19b200912fe4a78211a3d6212b143ece5e064.zip
Karl MacMillan wrote:
> > This largish patch makes the build and installation work on 64bit > > machines. The only catch here is that to get a 64bit build you need to > > set LIBDIR on make: > > > > make install LIBDIR=/usr/lib64 > > > > The spec file does this correctly. I couldn't find any reliable way to > > guess this that works both on real systems and in the almost entirely > > empty rpm build root (you can't, for example, check for the existence > > of /usr/lib64).
Diffstat (limited to 'ipa-server/ipaserver/krbinstance.py')
-rw-r--r--ipa-server/ipaserver/krbinstance.py4
1 files changed, 2 insertions, 2 deletions
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")