From 47bb098f10afca6d60b817f1ab20158f05c8e698 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 19 Oct 2018 12:42:09 +0100 Subject: [PATCH] accounts: Don't set mail routing address to an empty string Signed-off-by: Michael Tremer --- src/backend/accounts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/backend/accounts.py b/src/backend/accounts.py index dca60aa4..605a2b0b 100644 --- a/src/backend/accounts.py +++ b/src/backend/accounts.py @@ -230,7 +230,8 @@ class Account(Object): modlist.append((ldap.MOD_DELETE, key, None)) # Add new values - modlist.append((ldap.MOD_ADD, key, values)) + if values: + modlist.append((ldap.MOD_ADD, key, values)) # Run modify operation self._modify(modlist) @@ -242,7 +243,7 @@ class Account(Object): return self._set(key, values) def _set_strings(self, key, values): - return self._set(key, [e.encode() for e in values]) + return self._set(key, [e.encode() for e in values if e]) def _set_string(self, key, value): return self._set_strings(key, [value,]) @@ -416,7 +417,7 @@ class Account(Object): return self._get_string("mailRoutingAddress", None) def set_mail_routing_address(self, address): - self._set_string("mailRoutingAddress", address) + self._set_string("mailRoutingAddress", address or None) mail_routing_address = property(get_mail_routing_address, set_mail_routing_address) -- 2.47.3