--- server/ldap.c
+++ server/ldap.c	2007/04/26 11:42:39
@@ -1477,8 +1477,8 @@
   for (cnt=0; tempstr[cnt] != NULL; cnt++)
     {
       snprintf(sfilter, sizeof(sfilter), "(&(objectClass=dhcpService)"
-                        "(|(dhcpPrimaryDN=%s)(dhcpSecondaryDN=%s)))",
-                        hostdn, hostdn);
+                        "(|(|(dhcpPrimaryDN=%s)(dhcpSecondaryDN=%s))(dhcpServerDN=%s)))",
+                        hostdn, hostdn, hostdn);
       ldres = NULL;
       if ((ret = ldap_search_s (ld, tempstr[cnt], LDAP_SCOPE_BASE,
                                 sfilter, NULL, 0, &ldres)) != LDAP_SUCCESS)
@@ -1493,7 +1493,7 @@
 
       if ((ent = ldap_first_entry (ld, ldres)) == NULL)
         {
-          log_error ("Error: Cannot find dhcpService DN '%s' with primary or secondary server reference. Please update the LDAP server entry '%s'",
+          log_error ("Error: Cannot find dhcpService DN '%s' with server reference. Please update the LDAP server entry '%s'",
                      tempstr[cnt], hostdn);
 
           ldap_msgfree(ldres);