summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-08-19 16:39:33 -0400
committerSimo Sorce <ssorce@redhat.com>2008-08-21 11:04:52 -0400
commit2659fb0eb4e6a02cccd4473c0228241b32838e5a (patch)
tree5e37840d0ebde63ccf708a2c3e730250aa96068a
parentff82c4c1e56f14b225485da09722c7f709480ab9 (diff)
downloadfreeipa-2659fb0eb4e6a02cccd4473c0228241b32838e5a.tar.gz
freeipa-2659fb0eb4e6a02cccd4473c0228241b32838e5a.tar.xz
freeipa-2659fb0eb4e6a02cccd4473c0228241b32838e5a.zip
Minor bugs found while testing stuff.
- wrong import in certs.py makes ipa-replica-manage fail - close the fs after the stash file is written so that the file is updated immediately and not when the fd is garbage collected
-rw-r--r--ipa-server/ipaserver/certs.py2
-rw-r--r--ipa-server/ipaserver/krbinstance.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/ipa-server/ipaserver/certs.py b/ipa-server/ipaserver/certs.py
index 886632dab..8cb1d0883 100644
--- a/ipa-server/ipaserver/certs.py
+++ b/ipa-server/ipaserver/certs.py
@@ -21,9 +21,9 @@ import os, stat, subprocess, re
import sha
import errno
import tempfile
+import shutil
from ipa import sysrestore
-from ipa import shutil
from ipa import ipautil
CA_SERIALNO="/var/lib/ipa/ca_serialno"
diff --git a/ipa-server/ipaserver/krbinstance.py b/ipa-server/ipaserver/krbinstance.py
index 3981da9f7..4cdb801ee 100644
--- a/ipa-server/ipaserver/krbinstance.py
+++ b/ipa-server/ipaserver/krbinstance.py
@@ -330,6 +330,7 @@ class KrbInstance(service.Service):
try:
fd = open("/var/kerberos/krb5kdc/.k5."+self.realm, "w")
fd.write(s)
+ fd.close()
except os.error, e:
logging.critical("failed to write stash file")
raise e