Merge branch 'master' into workaround_import

plugins/module_utils/ansible_freeipa_module.py

@@ -45,6 +45,9 @@ else:
     from datetime import datetime
     from pprint import pformat
 
+    # ansible-freeipa requires locale to be C, IPA requires utf-8.
+    os.environ["LANGUAGE"] = "C"
+
     try:
         from packaging import version
     except ImportError:
@@ -294,6 +297,23 @@ else:
         """
         base_debug_msg = "Ansible arguments and IPA commands differed. "
 
+        # If both args and ipa are None, return there's no difference.
+        # If only one is None, return there is a difference.
+        # This tests avoid unecessary invalid access to attributes.
+        if args is None and ipa is None:
+            return True
+        if args is None or ipa is None:
+            module.debug(
+                base_debug_msg + "args is%s None an ipa is%s None" % (
+                   "" if args is None else " not", "" if ipa is None else " not",
+                )
+            )
+            return False
+
+        # Fail if args or ipa are not dicts.
+        if not (isinstance(args, dict) and isinstance(ipa, dict)):
+            raise TypeError("Expected 'dicts' to compare.")
+
         for key in args.keys():
             if key not in ipa:
                 module.debug(

plugins/modules/ipaprivilege.py

@@ -234,14 +234,22 @@ def main():
                 if action == "privilege":
                     # Found the privilege
                     if res_find is not None:
+                        res_cmp = {
+                            k: v for k, v in res_find.items()
+                            if k not in [
+                                "objectclass", "cn", "dn",
+                                "memberof_permisssion"
+                            ]
+                        }
                         # For all settings is args, check if there are
                         # different settings in the find result.
                         # If yes: modify
-                        if not compare_args_ipa(ansible_module, args,
-                                                res_find):
+                        if args and not compare_args_ipa(ansible_module, args,
+                                                         res_cmp):
                             commands.append([name, "privilege_mod", args])
                     else:
                         commands.append([name, "privilege_add", args])
+                        res_find = {}
 
                     member_args = {}
                     if permission: