Use DN objects instead of strings

* Convert every string specifying a DN into a DN object

* Every place a dn was manipulated in some fashion it was replaced by
  the use of DN operators

* Add new DNParam parameter type for parameters which are DN's

* DN objects are used 100% of the time throughout the entire data
  pipeline whenever something is logically a dn.

* Many classes now enforce DN usage for their attributes which are
  dn's. This is implmented via ipautil.dn_attribute_property(). The
  only permitted types for a class attribute specified to be a DN are
  either None or a DN object.

* Require that every place a dn is used it must be a DN object.
  This translates into lot of::

    assert isinstance(dn, DN)

  sprinkled through out the code. Maintaining these asserts is
  valuable to preserve DN type enforcement. The asserts can be
  disabled in production.

  The goal of 100% DN usage 100% of the time has been realized, these
  asserts are meant to preserve that.

  The asserts also proved valuable in detecting functions which did
  not obey their function signatures, such as the baseldap pre and
  post callbacks.

* Moved ipalib.dn to ipapython.dn because DN class is shared with all
  components, not just the server which uses ipalib.

* All API's now accept DN's natively, no need to convert to str (or
  unicode).

* Removed ipalib.encoder and encode/decode decorators. Type conversion
  is now explicitly performed in each IPASimpleLDAPObject method which
  emulates a ldap.SimpleLDAPObject method.

* Entity & Entry classes now utilize DN's

* Removed __getattr__ in Entity & Entity clases. There were two
  problems with it. It presented synthetic Python object attributes
  based on the current LDAP data it contained. There is no way to
  validate synthetic attributes using code checkers, you can't search
  the code to find LDAP attribute accesses (because synthetic
  attriutes look like Python attributes instead of LDAP data) and
  error handling is circumscribed. Secondly __getattr__ was hiding
  Python internal methods which broke class semantics.

* Replace use of methods inherited from ldap.SimpleLDAPObject via
  IPAdmin class with IPAdmin methods. Directly using inherited methods
  was causing us to bypass IPA logic. Mostly this meant replacing the
  use of search_s() with getEntry() or getList(). Similarly direct
  access of the LDAP data in classes using IPAdmin were replaced with
  calls to getValue() or getValues().

* Objects returned by ldap2.find_entries() are now compatible with
  either the python-ldap access methodology or the Entity/Entry access
  methodology.

* All ldap operations now funnel through the common
  IPASimpleLDAPObject giving us a single location where we interface
  to python-ldap and perform conversions.

* The above 4 modifications means we've greatly reduced the
  proliferation of multiple inconsistent ways to perform LDAP
  operations. We are well on the way to having a single API in IPA for
  doing LDAP (a long range goal).

* All certificate subject bases are now DN's

* DN objects were enhanced thusly:
  - find, rfind, index, rindex, replace and insert methods were added
  - AVA, RDN and DN classes were refactored in immutable and mutable
    variants, the mutable variants are EditableAVA, EditableRDN and
    EditableDN. By default we use the immutable variants preserving
    important semantics. To edit a DN cast it to an EditableDN and
    cast it back to DN when done editing. These issues are fully
    described in other documentation.
  - first_key_match was removed
  - DN equalty comparison permits comparison to a basestring

* Fixed ldapupdate to work with DN's. This work included:
  - Enhance test_updates.py to do more checking after applying
    update. Add test for update_from_dict(). Convert code to use
    unittest classes.
  - Consolidated duplicate code.
  - Moved code which should have been in the class into the class.
  - Fix the handling of the 'deleteentry' update action. It's no longer
    necessary to supply fake attributes to make it work. Detect case
    where subsequent update applies a change to entry previously marked
    for deletetion. General clean-up and simplification of the
    'deleteentry' logic.
  - Rewrote a couple of functions to be clearer and more Pythonic.
  - Added documentation on the data structure being used.
  - Simplfy the use of update_from_dict()

* Removed all usage of get_schema() which was being called prior to
  accessing the .schema attribute of an object. If a class is using
  internal lazy loading as an optimization it's not right to require
  users of the interface to be aware of internal
  optimization's. schema is now a property and when the schema
  property is accessed it calls a private internal method to perform
  the lazy loading.

* Added SchemaCache class to cache the schema's from individual
  servers. This was done because of the observation we talk to
  different LDAP servers, each of which may have it's own
  schema. Previously we globally cached the schema from the first
  server we connected to and returned that schema in all contexts. The
  cache includes controls to invalidate it thus forcing a schema
  refresh.

* Schema caching is now senstive to the run time context. During
  install and upgrade the schema can change leading to errors due to
  out-of-date cached schema. The schema cache is refreshed in these
  contexts.

* We are aware of the LDAP syntax of all LDAP attributes. Every
  attribute returned from an LDAP operation is passed through a
  central table look-up based on it's LDAP syntax. The table key is
  the LDAP syntax it's value is a Python callable that returns a
  Python object matching the LDAP syntax. There are a handful of LDAP
  attributes whose syntax is historically incorrect
  (e.g. DistguishedNames that are defined as DirectoryStrings). The
  table driven conversion mechanism is augmented with a table of
  hard coded exceptions.

  Currently only the following conversions occur via the table:

  - dn's are converted to DN objects

  - binary objects are converted to Python str objects (IPA
    convention).

  - everything else is converted to unicode using UTF-8 decoding (IPA
    convention).

  However, now that the table driven conversion mechanism is in place
  it would be trivial to do things such as converting attributes
  which have LDAP integer syntax into a Python integer, etc.

* Expected values in the unit tests which are a DN no longer need to
  use lambda expressions to promote the returned value to a DN for
  equality comparison. The return value is automatically promoted to
  a DN. The lambda expressions have been removed making the code much
  simpler and easier to read.

* Add class level logging to a number of classes which did not support
  logging, less need for use of root_logger.

* Remove ipaserver/conn.py, it was unused.

* Consolidated duplicate code wherever it was found.

* Fixed many places that used string concatenation to form a new
  string rather than string formatting operators. This is necessary
  because string formatting converts it's arguments to a string prior
  to building the result string. You can't concatenate a string and a
  non-string.

* Simplify logic in rename_managed plugin. Use DN operators to edit
  dn's.

* The live version of ipa-ldap-updater did not generate a log file.
  The offline version did, now both do.

https://fedorahosted.org/freeipa/ticket/1670
https://fedorahosted.org/freeipa/ticket/1671
https://fedorahosted.org/freeipa/ticket/1672
https://fedorahosted.org/freeipa/ticket/1673
https://fedorahosted.org/freeipa/ticket/1674
https://fedorahosted.org/freeipa/ticket/1392
https://fedorahosted.org/freeipa/ticket/2872

5 files changed, 130 insertions, 113 deletions

diff --git a/ipaserver/install/plugins/adtrust.py b/ipaserver/install/plugins/adtrust.py
index c32d82e3..555a28b8 100644
--- a/ipaserver/install/plugins/adtrust.py
+++ b/ipaserver/install/plugins/adtrust.py
@@ -20,7 +20,7 @@
 from ipaserver.install.plugins import MIDDLE
 from ipaserver.install.plugins.baseupdate import PostUpdate
 from ipalib import api, errors
-from ipalib.dn import DN
+from ipapython.dn import DN
 from ipapython.ipa_log_manager import *
 
 DEFAULT_ID_RANGE_SIZE = 200000
@@ -34,7 +34,7 @@ class update_default_range(PostUpdate):
     def execute(self, **options):
         ldap = self.obj.backend
 
-        dn = str(DN(api.env.container_ranges, api.env.basedn))
+        dn = DN(api.env.container_ranges, api.env.basedn)
         search_filter = "objectclass=ipaDomainIDRange"
         try:
             (entries, truncated) = ldap.find_entries(search_filter, [], dn)
@@ -44,7 +44,7 @@ class update_default_range(PostUpdate):
             root_logger.debug("default_range: ipaDomainIDRange entry found, skip plugin")
             return (False, False, [])
 
-        dn = str(DN(('cn', 'admins'), api.env.container_group, api.env.basedn))
+        dn = DN(('cn', 'admins'), api.env.container_group, api.env.basedn)
         try:
             (dn, admins_entry) = ldap.get_entry(dn, ['gidnumber'])
         except errors.NotFound:
@@ -65,12 +65,10 @@ class update_default_range(PostUpdate):
                       ]
 
         updates = {}
-        dn = str(DN(('cn', '%s_id_range' % api.env.realm),
-                 api.env.container_ranges, api.env.basedn))
+        dn = DN(('cn', '%s_id_range' % api.env.realm),
+                api.env.container_ranges, api.env.basedn)
 
-        # make sure everything is str or otherwise python-ldap would complain
-        range_entry = map(str, range_entry)
-        updates[dn] = {'dn' : dn, 'default' : range_entry}
+        updates[dn] = {'dn': dn, 'default': range_entry}
 
         # Default range entry has a hard-coded range size to 200000 which is
         # a default range size in ipa-server-install. This could cause issues
@@ -78,7 +76,7 @@ class update_default_range(PostUpdate):
         # bigger range (option --idmax).
         # We should make our best to check if this is the case and provide
         # user with an information how to fix it.
-        dn = str(DN(api.env.container_dna_posix_ids, api.env.basedn))
+        dn = DN(api.env.container_dna_posix_ids, api.env.basedn)
         search_filter = "objectclass=dnaSharedConfig"
         attrs = ['dnaHostname', 'dnaRemainingValues']
         try:
diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
index e11c331a..d5559670 100644
--- a/ipaserver/install/plugins/dns.py
+++ b/ipaserver/install/plugins/dns.py
@@ -21,7 +21,7 @@ from ipaserver.install.plugins import MIDDLE
 from ipaserver.install.plugins.baseupdate import PostUpdate
 from ipaserver.install.plugins import baseupdate
 from ipalib import api, errors, util
-from ipalib.dn import DN
+from ipapython.dn import DN
 from ipalib.plugins.dns import dns_container_exists
 from ipapython.ipa_log_manager import *
 
@@ -89,31 +89,29 @@ class update_dns_permissions(PostUpdate):
     entries otherwise.
     """
 
-    _write_dns_perm_dn = DN('cn=Write DNS Configuration',
-                            api.env.container_permission,
-                            api.env.basedn)
+    _write_dns_perm_dn = DN(('cn', 'Write DNS Configuration'),
+                            api.env.container_permission, api.env.basedn)
     _write_dns_perm_entry = ['objectClass:groupofnames',
                              'objectClass:top',
                              'cn:Write DNS Configuration',
                              'description:Write DNS Configuration',
-                             'member:cn=DNS Administrators,cn=privileges,cn=pbac,%s' \
-                                     % api.env.basedn,
-                             'member:cn=DNS Servers,cn=privileges,cn=pbac,%s' \
-                                     % api.env.basedn]
-
-    _read_dns_perm_dn = DN('cn=Read DNS Entries',
-                            api.env.container_permission,
-                            api.env.basedn)
+                             'member:%s' % DN(('cn', 'DNS Administrators'), ('cn', 'privileges'), ('cn', 'pbac'),
+                                              api.env.basedn),
+                             'member:%s' % DN(('cn', 'DNS Servers'), ('cn', 'privileges'), ('cn', 'pbac'),
+                                              api.env.basedn)]
+
+    _read_dns_perm_dn = DN(('cn', 'Read DNS Entries'),
+                            api.env.container_permission, api.env.basedn)
     _read_dns_perm_entry = ['objectClass:top',
                             'objectClass:groupofnames',
                             'objectClass:ipapermission',
                             'cn:Read DNS Entries',
                             'description:Read DNS entries',
                             'ipapermissiontype:SYSTEM',
-                            'member:cn=DNS Administrators,cn=privileges,cn=pbac,%s' \
-                                     % api.env.basedn,
-                            'member:cn=DNS Servers,cn=privileges,cn=pbac,%s' \
-                                     % api.env.basedn,]
+                            'member:%s' % DN(('cn', 'DNS Administrators'), ('cn', 'privileges'), ('cn', 'pbac'),
+                                             api.env.basedn),
+                            'member:%s' % DN(('cn', 'DNS Servers'), ('cn', 'privileges'), ('cn', 'pbac'),
+                                             api.env.basedn),]
 
     _write_dns_aci_dn = DN(api.env.basedn)
     _write_dns_aci_entry = ['add:aci:\'(targetattr = "idnsforwardpolicy || idnsforwarders || idnsallowsyncptr || idnszonerefresh || idnspersistentsearch")(target = "ldap:///cn=dns,%(realm)s")(version 3.0;acl "permission:Write DNS Configuration";allow (write) groupdn = "ldap:///cn=Write DNS Configuration,cn=permissions,cn=pbac,%(realm)s";)\'' % dict(realm=api.env.basedn)]
@@ -135,10 +133,7 @@ class update_dns_permissions(PostUpdate):
                                      (self._write_dns_aci_dn, 'updates', self._write_dns_aci_entry),
                                      (self._read_dns_aci_dn, 'updates', self._read_dns_aci_entry)):
 
-            dn = str(dn)
-            # make sure everything is str or otherwise python-ldap would complain
-            entry = map(str, entry)
-            dnsupdates[dn] = {'dn' : dn, container : entry}
+            dnsupdates[dn] = {'dn': dn, container: entry}
 
         return (False, True, [dnsupdates])
 
@@ -161,9 +156,9 @@ class update_dns_limits(PostUpdate):
             return (False, False, [])
 
         dns_principal = 'DNS/%s@%s' % (self.env.host, self.env.realm)
-        dns_service_dn = str(DN(('krbprincipalname', dns_principal),
-                                self.env.container_service,
-                                self.env.basedn))
+        dns_service_dn = DN(('krbprincipalname', dns_principal),
+                            self.env.container_service,
+                            self.env.basedn)
 
         try:
             (dn, entry) = ldap.get_entry(dns_service_dn, self.limit_attributes)
diff --git a/ipaserver/install/plugins/fix_replica_memberof.py b/ipaserver/install/plugins/fix_replica_memberof.py
index 23bde0c9..d4ab7534 100644
--- a/ipaserver/install/plugins/fix_replica_memberof.py
+++ b/ipaserver/install/plugins/fix_replica_memberof.py
@@ -44,7 +44,7 @@ class update_replica_exclude_attribute_list(PreUpdate):
         entries = repl.find_replication_agreements()
         self.log.debug("Found %d agreement(s)", len(entries))
         for replica in entries:
-            self.log.debug(replica.description)
+            self.log.debug(replica.getValue('description'))
             attrlist = replica.getValue('nsDS5ReplicatedAttributeList')
             if attrlist is None:
                 self.log.debug("Adding nsDS5ReplicatedAttributeList and nsDS5ReplicatedAttributeListTotal")
@@ -68,7 +68,7 @@ class update_replica_exclude_attribute_list(PreUpdate):
                     self.log.debug("Attribute list needs updating")
                     current = replica.toDict()
                     replica.setValue('nsDS5ReplicatedAttributeList',
-                        replica.nsDS5ReplicatedAttributeList + ' %s' % ' '.join(missing))
+                        replica.getValue('nsDS5ReplicatedAttributeList') + ' %s' % ' '.join(missing))
                     try:
                         repl.conn.updateEntry(replica.dn, current, replica.toDict())
                         self.log.debug("Updated")
diff --git a/ipaserver/install/plugins/rename_managed.py b/ipaserver/install/plugins/rename_managed.py
index a9eed0be..99dac814 100644
--- a/ipaserver/install/plugins/rename_managed.py
+++ b/ipaserver/install/plugins/rename_managed.py
@@ -24,6 +24,7 @@ from ipalib.frontend import Updater
 from ipaserver.install.plugins import baseupdate
 from ipalib import api, errors
 from ipapython import ipautil
+from ipapython.dn import DN, EditableDN
 import ldap as _ldap
 
 def entry_to_update(entry):
@@ -44,67 +45,99 @@ def entry_to_update(entry):
 
     return update
 
-def generate_update(ldap, deletes=False):
-    """
-    We need to separate the deletes that need to happen from the
-    new entries that need to be added.
-    """
-    suffix = ipautil.realm_to_suffix(api.env.realm)
-    searchfilter = '(objectclass=*)'
-    definitions_managed_entries = []
-    old_template_container = 'cn=etc,%s' % suffix
-    old_definition_container = 'cn=managed entries,cn=plugins,cn=config'
-    new = 'cn=Managed Entries,cn=etc,%s' % suffix
-    sub = ['cn=Definitions,', 'cn=Templates,']
-    new_managed_entries = []
-    old_templates = []
-    template = None
-    restart = False
-
-    # If the old entries don't exist the server has already been updated.
-    try:
-        (definitions_managed_entries, truncated) = ldap.find_entries(
-            searchfilter, ['*'], old_definition_container, _ldap.SCOPE_ONELEVEL, normalize=False
-        )
-    except errors.NotFound, e:
-        return (False, new_managed_entries)
-
-    for entry in definitions_managed_entries:
-        new_definition = {}
-        definition_managed_entry_updates = {}
-        if deletes:
-            old_definition = {'dn': str(entry[0]), 'deleteentry': ['dn: %s' % str(entry[0])]}
-            old_template = str(entry[1]['managedtemplate'][0])
-            definition_managed_entry_updates[old_definition['dn']] = old_definition
-            old_templates.append(old_template)
-        else:
-            entry[1]['managedtemplate'] = str(entry[1]['managedtemplate'][0].replace(old_template_container, sub[1] + new))
-            new_definition['dn'] = str(entry[0].replace(old_definition_container, sub[0] + new))
-            new_definition['default'] = entry_to_update(entry[1])
-            definition_managed_entry_updates[new_definition['dn']] = new_definition
-            new_managed_entries.append(definition_managed_entry_updates)
-    for old_template in old_templates: # Only happens when deletes is True
-        try:
-            (dn, template) = ldap.get_entry(old_template, ['*'], normalize=False)
-            dn = str(dn)
-            new_template = {}
-            template_managed_entry_updates = {}
-            old_template = {'dn': dn, 'deleteentry': ['dn: %s' % dn]}
-            new_template['dn'] = str(dn.replace(old_template_container, sub[1] + new))
-            new_template['default'] = entry_to_update(template)
-            template_managed_entry_updates[new_template['dn']] = new_template
-            template_managed_entry_updates[old_template['dn']] = old_template
-            new_managed_entries.append(template_managed_entry_updates)
-        except errors.NotFound, e:
-            pass
+class GenerateUpdateMixin(object):
+    def generate_update(self, deletes=False):
+        """
+        We need to separate the deletes that need to happen from the
+        new entries that need to be added.
+        """
+        ldap = self.obj.backend
 
-    if len(new_managed_entries) > 0:
-        restart = True
-        new_managed_entries.sort(reverse=True)
+        suffix = ipautil.realm_to_suffix(api.env.realm)
+        searchfilter = '(objectclass=*)'
+        definitions_managed_entries = []
 
-    return (restart, new_managed_entries)
+        old_template_container = DN(('cn', 'etc'), suffix)
+        new_template_container = DN(('cn', 'Templates'), ('cn', 'Managed Entries'), ('cn', 'etc'), suffix)
 
-class update_managed_post_first(PreUpdate):
+        old_definition_container = DN(('cn', 'managed entries'), ('cn', 'plugins'), ('cn', 'config'), suffix)
+        new_definition_container = DN(('cn', 'Definitions'), ('cn', 'Managed Entries'), ('cn', 'etc'), suffix)
+
+        definitions_dn = DN(('cn', 'Definitions'))
+        update_list = []
+        restart = False
+
+        # If the old entries don't exist the server has already been updated.
+        try:
+            (definitions_managed_entries, truncated) = ldap.find_entries(
+                searchfilter, ['*'], old_definition_container, _ldap.SCOPE_ONELEVEL, normalize=False
+            )
+        except errors.NotFound, e:
+            return (False, update_list)
+
+        for entry in definitions_managed_entries:
+            assert isinstance(entry.dn, DN)
+            if deletes:
+                old_dn = entry.data['managedtemplate'][0]
+                assert isinstance(old_dn, DN)
+                try:
+                    (old_dn, entry) = ldap.get_entry(old_dn, ['*'], normalize=False)
+                except errors.NotFound, e:
+                    pass
+                else:
+                    # Compute the new dn by replacing the old container with the new container
+                    new_dn = EditableDN(old_dn)
+                    if new_dn.replace(old_template_container, new_template_container) != 1:
+                        self.error("unable to replace '%s' with '%s' in '%s'",
+                                   old_template_container, new_template_container, old_dn)
+                        continue
+
+                    new_dn = DN(new_dn)
+
+                    # The old attributes become defaults for the new entry
+                    new_update = {'dn': new_dn,
+                                  'default': entry_to_update(entry)}
+
+                    # Delete the old entry
+                    old_update = {'dn': old_dn, 'deleteentry': None}
+
+                    # Add the delete and replacement updates to the list of all updates
+                    update_list.append({old_dn: old_update, new_dn: new_update})
+
+            else:
+                # Update the template dn by replacing the old containter with the new container
+                old_dn = entry.data['managedtemplate'][0]
+                new_dn = EditableDN(old_dn)
+                if new_dn.replace(old_template_container, new_template_container) != 1:
+                    self.error("unable to replace '%s' with '%s' in '%s'",
+                               old_template_container, new_template_container, old_dn)
+                    continue
+                new_dn = DN(new_dn)
+                entry.data['managedtemplate'] = new_dn
+
+                # Edit the dn, then convert it back to an immutable DN
+                old_dn = entry.dn
+                new_dn = EditableDN(old_dn)
+                if new_dn.replace(old_definition_container, new_definition_container) != 1:
+                    self.error("unable to replace '%s' with '%s' in '%s'",
+                               old_definition_container, new_definition_container, old_dn)
+                    continue
+                new_dn = DN(new_dn)
+
+                # The old attributes become defaults for the new entry
+                new_update = {'dn': new_dn,
+                              'default': entry_to_update(entry.data)}
+
+                # Add the replacement update to the collection of all updates
+                update_list.append({new_dn: new_update})
+
+        if len(update_list) > 0:
+            restart = True
+            update_list.sort(reverse=True)
+
+        return (restart, update_list)
+
+class update_managed_post_first(PreUpdate, GenerateUpdateMixin):
     """
     Update managed entries
     """
@@ -112,21 +145,21 @@ class update_managed_post_first(PreUpdate):
 
     def execute(self, **options):
         # Never need to restart with the pre-update changes
-        (ignore, new_managed_entries) = generate_update(self.obj.backend, False)
+        (ignore, update_list) = self.generate_update(False)
 
-        return (False, True, new_managed_entries)
+        return (False, True, update_list)
 
 api.register(update_managed_post_first)
 
-class update_managed_post(PostUpdate):
+class update_managed_post(PostUpdate, GenerateUpdateMixin):
     """
     Update managed entries
     """
     order=LAST
 
     def execute(self, **options):
-        (restart, new_managed_entries) = generate_update(self.obj.backend, True)
+        (restart, update_list) = self.generate_update(True)
 
-        return (restart, True, new_managed_entries)
+        return (restart, True, update_list)
 
 api.register(update_managed_post)
diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py
index e2376947..dca2c75d 100644
--- a/ipaserver/install/plugins/updateclient.py
+++ b/ipaserver/install/plugins/updateclient.py
@@ -25,6 +25,7 @@ from ipaserver.install.ldapupdate import LDAPUpdate
 from ipapython.ipautil import wait_for_open_socket
 from ipalib import api
 from ipalib import backend
+from ipapython.dn import DN
 import ldap as _ldap
 
 class updateclient(backend.Executioner):
@@ -44,7 +45,7 @@ class updateclient(backend.Executioner):
 
     updates is a dictionary keyed on dn. The value of an update is a
     dictionary with the following possible values:
-      - dn: str, duplicate of the key
+      - dn: DN, equal to the dn attribute
       - updates: list of updates against the dn
       - default: list of the default entry to be added if it doesn't
                  exist
@@ -103,7 +104,7 @@ class updateclient(backend.Executioner):
             autobind = False
         else:
             autobind = True
-        self.Backend.ldap2.connect(bind_dn='cn=Directory Manager', bind_pw=dm_password, autobind=autobind)
+        self.Backend.ldap2.connect(bind_dn=DN(('cn', 'Directory Manager')), bind_pw=dm_password, autobind=autobind)
 
     def order(self, updatetype):
         """Return plugins of the given updatetype in sorted order.
@@ -125,22 +126,12 @@ class updateclient(backend.Executioner):
             (restart, apply_now, res) = self.run(update.name, **kw)
             if restart:
                 self.restart(dm_password, live_run)
-            dn_list = {}
-            for upd in res:
-                for dn in upd:
-                    dn_explode = _ldap.explode_dn(dn.lower())
-                    l = len(dn_explode)
-                    if dn_list.get(l):
-                        if dn not in dn_list[l]:
-                            dn_list[l].append(dn)
-                    else:
-                        dn_list[l] = [dn]
-            updates = {}
-            for entry in res:
-                updates.update(entry)
 
             if apply_now:
-                ld.update_from_dict(dn_list, updates)
+                updates = {}
+                for entry in res:
+                    updates.update(entry)
+                ld.update_from_dict(updates)
             elif res:
                 result.extend(res)