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

client: remove unneded return configure_krb5_conf

Browse Source 
Function configure_krb5_conf always returns 0 as return state. Remove
the 'return' statement and let exceptions work

https://fedorahosted.org/freeipa/ticket/6392

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Martin Basti 2016-10-19 16:35:54 +02:00 committed by Jan Cholasta
parent f98faec478
commit 5c16608a0d
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ipaclient/install/client.py
View File

@ -1015,8 +1015,6 @@ def configure_krb5_conf(
krbconf.newConf(filename, opts) krbconf.newConf(filename, opts)
os.chmod(filename, 0o644) os.chmod(filename, 0o644)
return 0
def configure_certmonger( def configure_certmonger(
fstore, subject_base, cli_realm, hostname, options, ca_enabled): fstore, subject_base, cli_realm, hostname, options, ca_enabled):
@ -2580,18 +2578,16 @@ def install(options, env, fstore, statestore):
try: try:
(krb_fd, krb_name) = tempfile.mkstemp() (krb_fd, krb_name) = tempfile.mkstemp()
os.close(krb_fd) os.close(krb_fd)
if configure_krb5_conf( configure_krb5_conf(
cli_realm=cli_realm, cli_realm=cli_realm,
cli_domain=cli_domain, cli_domain=cli_domain,
cli_server=cli_server, cli_server=cli_server,
cli_kdc=cli_kdc, cli_kdc=cli_kdc,
dnsok=False, dnsok=False,
options=options, options=options,
filename=krb_name, filename=krb_name,
client_domain=client_domain, client_domain=client_domain,
client_hostname=hostname): client_hostname=hostname)
root_logger.error("Test kerberos configuration failed")
return CLIENT_INSTALL_ERROR
env['KRB5_CONFIG'] = krb_name env['KRB5_CONFIG'] = krb_name
ccache_dir = tempfile.mkdtemp(prefix='krbcc') ccache_dir = tempfile.mkdtemp(prefix='krbcc')
ccache_name = os.path.join(ccache_dir, 'ccache') ccache_name = os.path.join(ccache_dir, 'ccache')
@ -2791,17 +2787,16 @@ def install(options, env, fstore, statestore):
else: else:
# Configure krb5.conf # Configure krb5.conf
fstore.backup_file(paths.KRB5_CONF) fstore.backup_file(paths.KRB5_CONF)
if configure_krb5_conf( configure_krb5_conf(
cli_realm=cli_realm, cli_realm=cli_realm,
cli_domain=cli_domain, cli_domain=cli_domain,
cli_server=cli_server, cli_server=cli_server,
cli_kdc=cli_kdc, cli_kdc=cli_kdc,
dnsok=dnsok, dnsok=dnsok,
options=options, options=options,
filename=paths.KRB5_CONF, filename=paths.KRB5_CONF,
client_domain=client_domain, client_domain=client_domain,
client_hostname=hostname): client_hostname=hostname)
return CLIENT_INSTALL_ERROR
root_logger.info( root_logger.info(
"Configured /etc/krb5.conf for IPA realm %s", cli_realm) "Configured /etc/krb5.conf for IPA realm %s", cli_realm)