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

ipactl restart: fix wrong logic when checking service list

Browse Source 
ipactl is building a list of currently running services from
the content of /var/run/ipa/services.list, and a list of expected services
from the services configured in LDAP.

Because CA and KRA both correspond to the same pki-tomcatd service, the
lists may contain duplicates. The code handling these duplicates is called
at the wrong place, and may result in a wrong list of services to
stop / restart / start.
The fix removes the duplicates before returning the lists, hence making sure
that there is no error when building the list of services to stop / restart
/ start.

Fixes: https://pagure.io/freeipa/issue/7927
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Florence Blanc-Renaud 2019-04-26 15:10:22 +02:00 committed by Christian Heimes
parent bdce9164a1
commit 161008d5ca
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install/tools/ipactl.in
View File

@ -237,7 +237,7 @@ def get_config(dirsrv):
for order, svc in sorted(svc_list): for order, svc in sorted(svc_list):
if svc in service.SERVICE_LIST: if svc in service.SERVICE_LIST:
ordered_list.append(service.SERVICE_LIST[svc].systemd_name) ordered_list.append(service.SERVICE_LIST[svc].systemd_name)
return ordered_list return deduplicate(ordered_list)
def get_config_from_file(): def get_config_from_file():
@ -263,7 +263,7 @@ def get_config_from_file():
if svc in svc_list: if svc in svc_list:
ordered_list.append(svc) ordered_list.append(svc)
return ordered_list return deduplicate(ordered_list)
def stop_services(svc_list): def stop_services(svc_list):
@ -325,7 +325,6 @@ def ipa_start(options):
# no service to start # no service to start
return return
svc_list = deduplicate(svc_list)
for svc in svc_list: for svc in svc_list:
svchandle = services.service(svc, api=api) svchandle = services.service(svc, api=api)
try: try:
@ -365,7 +364,6 @@ def ipa_stop(options):
finally: finally:
raise IpactlError() raise IpactlError()
svc_list = deduplicate(svc_list)
for svc in reversed(svc_list): for svc in reversed(svc_list):
svchandle = services.service(svc, api=api) svchandle = services.service(svc, api=api)
try: try:
@ -452,7 +450,6 @@ def ipa_restart(options):
if len(old_svc_list) != 0: if len(old_svc_list) != 0:
# we need to definitely stop some services # we need to definitely stop some services
old_svc_list = deduplicate(old_svc_list)
for svc in reversed(old_svc_list): for svc in reversed(old_svc_list):
svchandle = services.service(svc, api=api) svchandle = services.service(svc, api=api)
try: try:
@ -477,7 +474,6 @@ def ipa_restart(options):
if len(svc_list) != 0: if len(svc_list) != 0:
# there are services to restart # there are services to restart
svc_list = deduplicate(svc_list)
for svc in svc_list: for svc in svc_list:
svchandle = services.service(svc, api=api) svchandle = services.service(svc, api=api)
try: try:
@ -500,7 +496,6 @@ def ipa_restart(options):
if len(new_svc_list) != 0: if len(new_svc_list) != 0:
# we still need to start some services # we still need to start some services
new_svc_list = deduplicate(new_svc_list)
for svc in new_svc_list: for svc in new_svc_list:
svchandle = services.service(svc, api=api) svchandle = services.service(svc, api=api)
try: try:
@ -552,7 +547,6 @@ def ipa_status(options):
if len(svc_list) == 0: if len(svc_list) == 0:
return return
svc_list = deduplicate(svc_list)
for svc in svc_list: for svc in svc_list:
svchandle = services.service(svc, api=api) svchandle = services.service(svc, api=api)
try: try: