From 8ea227451f4d85dbca6a331a607d25744e85121b Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 2 May 2018 11:42:02 -0400 Subject: [PATCH] Drop attr defaultServerList if removing the last server 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 Reviewed-By: Stanislav Laznicka Reviewed-By: Christian Heimes --- ipaserver/plugins/server.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py index 4ea6f5b4b..45ba30fb3 100644 --- a/ipaserver/plugins/server.py +++ b/ipaserver/plugins/server.py @@ -615,8 +615,10 @@ class server_del(LDAPDelete): srvlist = srvlist.split() if master in srvlist: srvlist.remove(master) - attr = ' '.join(srvlist) - ret['defaultServerList'] = attr + if not srvlist: + del ret['defaultServerList'] + else: + ret['defaultServerList'] = ' '.join(srvlist) conn.update_entry(ret) except (errors.NotFound, errors.MidairCollision, errors.EmptyModlist):