mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Installers fix: remove temporal ccache
Environ variable may be changed outside, so store path into global variable. https://fedorahosted.org/freeipa/ticket/5042 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
parent
e2c2d5967d
commit
af8f44c86a
@ -41,6 +41,7 @@ SYSRESTORE_DIR_PATH = paths.SYSRESTORE
|
||||
|
||||
installation_cleanup = True
|
||||
original_ccache = None
|
||||
temp_ccache = None
|
||||
|
||||
|
||||
def validate_dm_password(password):
|
||||
@ -248,24 +249,28 @@ def set_subject_in_config(realm_name, dm_password, suffix, subject_base):
|
||||
|
||||
|
||||
def init_private_ccache():
|
||||
(desc, path) = tempfile.mkstemp(prefix='krbcc')
|
||||
global original_ccache
|
||||
global temp_ccache
|
||||
|
||||
(desc, temp_ccache) = tempfile.mkstemp(prefix='krbcc')
|
||||
os.close(desc)
|
||||
|
||||
original_ccache = os.environ.get('KRB5CCNAME', None)
|
||||
original_ccache = os.environ.get('KRB5CCNAME')
|
||||
|
||||
os.environ['KRB5CCNAME'] = path
|
||||
os.environ['KRB5CCNAME'] = temp_ccache
|
||||
|
||||
|
||||
def destroy_private_ccache():
|
||||
path = os.environ.get('KRB5CCNAME')
|
||||
global original_ccache
|
||||
global temp_ccache
|
||||
|
||||
if original_ccache is not None:
|
||||
os.environ['KRB5CCNAME'] = original_ccache
|
||||
else:
|
||||
os.environ.pop('KRB5CCNAME', None)
|
||||
|
||||
if os.path.exists(path):
|
||||
os.remove(path)
|
||||
if os.path.exists(temp_ccache):
|
||||
os.remove(temp_ccache)
|
||||
|
||||
|
||||
def common_cleanup(func):
|
||||
|
Loading…
Reference in New Issue
Block a user