IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

replica promotion: use host credentials for connection check

Browse Source 
https://fedorahosted.org/freeipa/ticket/5497

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Jan Cholasta 2015-12-09 09:25:13 +01:00 committed by Tomas Babej
parent 8d7f67e08c
commit 14a44ea47b
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ipaserver/install/server/replicainstall.py
View File

@ -987,18 +987,6 @@ def promote_check(installer):
paths.KRB5_KEYTAB, paths.KRB5_KEYTAB,
ccache) ccache)
if not options.skip_conncheck:
if installer._ccache is None:
del os.environ['KRB5CCNAME']
else:
os.environ['KRB5CCNAME'] = installer._ccache
try:
installutils.check_creds(options, config.realm_name)
installer._ccache = os.environ.get('KRB5CCNAME')
finally:
os.environ['KRB5CCNAME'] = ccache
cafile = paths.IPA_CA_CRT cafile = paths.IPA_CA_CRT
if not ipautil.file_exists(cafile): if not ipautil.file_exists(cafile):
raise RuntimeError("CA cert file is not available! Please reinstall" raise RuntimeError("CA cert file is not available! Please reinstall"
@ -1198,10 +1186,12 @@ def promote_check(installer):
# check connection # check connection
if not options.skip_conncheck: if not options.skip_conncheck:
if installer._ccache is None: if add_to_ipaservers:
del os.environ['KRB5CCNAME'] # use user's credentials when the server host is not ipaservers
else: if installer._ccache is None:
os.environ['KRB5CCNAME'] = installer._ccache del os.environ['KRB5CCNAME']
else:
os.environ['KRB5CCNAME'] = installer._ccache
try: try:
replica_conn_check( replica_conn_check(
@ -1210,7 +1200,8 @@ def promote_check(installer):
options.admin_password, principal=options.principal, options.admin_password, principal=options.principal,
ca_cert_file=cafile) ca_cert_file=cafile)
finally: finally:
os.environ['KRB5CCNAME'] = ccache if add_to_ipaservers:
os.environ['KRB5CCNAME'] = ccache
if not ipautil.file_exists(cafile): if not ipautil.file_exists(cafile):
raise RuntimeError("CA cert file is not available.") raise RuntimeError("CA cert file is not available.")