Index: 42_cn_groups.quilt
===================================================================
--- 42_cn_groups.quilt	(Revision 19512)
+++ 42_cn_groups.quilt	(Arbeitskopie)
@@ -239,3 +239,18 @@
 +-
 +replace: showInAdvancedViewOnly
 +showInAdvancedViewOnly: FALSE
+diff --git python/samba/dbchecker.py python/samba/dbchecker.py
+index 0085b4a8515..1030a1e553d 100644
+--- python/samba/dbchecker.py
++++ python/samba/dbchecker.py
+@@ -131,7 +131,8 @@ class dbcheck(object):
+         self.link_id_cache = {}
+         self.name_map = {}
+         try:
+-            res = samdb.search(base="CN=DnsAdmins,CN=Users,%s" % samdb.domain_dn(), scope=ldb.SCOPE_BASE,
++            res = samdb.search(base="%s" % samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE,
++                               expression="(&(CN=DnsAdmins)(objectClass=group))",
+                                attrs=["objectSid"])
+             dnsadmins_sid = ndr_unpack(security.dom_sid, res[0]["objectSid"][0])
+             self.name_map['DnsAdmins'] = str(dnsadmins_sid)
+