summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ipautil.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 104f9d180..89047b2e8 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -1345,8 +1345,10 @@ def posixify(string):
def private_ccache(path=None):
if path is None:
- (desc, path) = tempfile.mkstemp(prefix='krbcc')
- os.close(desc)
+ dir_path = tempfile.mkdtemp(prefix='krbcc')
+ path = os.path.join(dir_path, 'ccache')
+ else:
+ dir_path = None
original_value = os.environ.get('KRB5CCNAME', None)
@@ -1362,6 +1364,11 @@ def private_ccache(path=None):
if os.path.exists(path):
os.remove(path)
+ if dir_path is not None:
+ try:
+ os.rmdir(dir_path)
+ except OSError:
+ pass
if six.PY2: