Client: Added version checks for save_state and configure_nisdomain calls

With FreeIPA 4.5 the functions save_state and configure_nisdomain have gotten
new options. A version check has been added to ipaextras and ipanss to make
sure that the modules are also working with FreeIPA 4.4.
This commit is contained in:
Thomas Woerner
2018-02-09 16:38:15 +01:00
parent aaea687a3b
commit 9beb31bf5c
2 changed files with 13 additions and 4 deletions

View File

@@ -191,8 +191,11 @@ def main():
configure_firefox(options, statestore, domain)
if not no_nisdomain:
configure_nisdomain(
options=options, domain=domain, statestore=statestore)
if NUM_VERSION < 40500:
configure_nisdomain(options=options, domain=domain)
else:
configure_nisdomain(options=options, domain=domain,
statestore=statestore)
# Cleanup: Remove CCACHE_FILE
try:

View File

@@ -215,7 +215,10 @@ def main():
# (if installed)
nscd = services.knownservices.nscd
if nscd.is_installed():
save_state(nscd, statestore)
if NUM_VERSION < 40500:
save_state(nscd)
else:
save_state(nscd, statestore)
try:
nscd_service_action = 'stop'
@@ -232,7 +235,10 @@ def main():
nslcd = services.knownservices.nslcd
if nslcd.is_installed():
save_state(nslcd, statestore)
if NUM_VERSION < 40500:
save_state(nslcd)
else:
save_state(nslcd, statestore)
##########################################################################