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

Drop attr defaultServerList if removing the last server

Browse Source 
This otherwise returns a syntax error if trying to set
an empty value.

Related: https://pagure.io/freeipa/issue/6760

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Rob Crittenden
2018-05-02 11:42:02 -04:00
committed by Tibor Dudlák
parent b96906156b
commit 8ea227451f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/plugins/server.py
View File

@@ -615,8 +615,10 @@ class server_del(LDAPDelete):
srvlist = srvlist.split() srvlist = srvlist.split()
if master in srvlist: if master in srvlist:
srvlist.remove(master) srvlist.remove(master)
attr = ' '.join(srvlist) if not srvlist:
ret['defaultServerList'] = attr del ret['defaultServerList']
else:
ret['defaultServerList'] = ' '.join(srvlist)
conn.update_entry(ret) conn.update_entry(ret)
except (errors.NotFound, errors.MidairCollision, except (errors.NotFound, errors.MidairCollision,
errors.EmptyModlist): errors.EmptyModlist):