Do not crash on empty --setattr, --getattr, --addattr

Also the unused `append` argument from _convert_2_dict.

https://fedorahosted.org/freeipa/ticket/2680

2 files changed, 10 insertions, 9 deletions

diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 5a8013efc..e4f8cdc69 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -791,18 +791,18 @@ last, after all sets and adds."""),
                          exclude='webui',
                         )
 
-    def _convert_2_dict(self, attrs, append=True):
+    def _convert_2_dict(self, attrs):
         """
         Convert a string in the form of name/value pairs into a dictionary.
-        The incoming attribute may be a string or a list.
 
-        :param attrs: A list of name/value pairs
-
-        :param append: controls whether this returns a list of values or a single
-        value.
+        :param attrs: A list of name/value pair strings, in the "name=value"
+            format. May also be a single string, or None.
         """
+
         newdict = {}
-        if not type(attrs) in (list, tuple):
+        if attrs is None:
+            attrs = []
+        elif not type(attrs) in (list, tuple):
             attrs = [attrs]
         for a in attrs:
             m = re.match("\s*(.*?)\s*=\s*(.*?)\s*$", a)
@@ -811,7 +811,7 @@ last, after all sets and adds."""),
             if len(value) == 0:
                 # None means "delete this attribute"
                 value = None
-            if append and attr in newdict:
+            if attr in newdict:
                 if type(value) in (tuple,):
                     newdict[attr] += list(value)
                 else:
diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py
index 6877a6306..5916ebd2d 100644
--- a/tests/test_xmlrpc/test_attr.py
+++ b/tests/test_xmlrpc/test_attr.py
@@ -39,7 +39,8 @@ class test_attr(Declarative):
         dict(
             desc='Create %r' % user1,
             command=(
-                'user_add', [user1], dict(givenname=u'Test', sn=u'User1')
+                'user_add', [user1], dict(givenname=u'Test', sn=u'User1',
+                    setattr=None)
             ),
             expected=dict(
                 value=user1,