accounts: Don't set mail routing address to an empty string

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index dca60aa41132a64ac3d2910cb3895b7c2cde7351..605a2b0b770cfd03d3baf32bd6f066517e414026 100644 (file)
--- 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)