Additional sanity check in filter_servers().

Logging queries lost the RRtype.

Revert to e.g. query[A] example.com

src/cache.c

@@ -2360,6 +2360,8 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg,
     source = "reply";
   else if (flags & F_AUTH)
     source = "auth";
+  else if (flags & F_QUERY)
+    source = "query";
   else if (flags & F_SECSTAT)
     {
       if (addr && addr->log.ede != EDE_UNSET && option_bool(OPT_EXTRALOG))
@@ -2400,8 +2402,8 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg,
 	  source = "non-query opcode";
 	  name = opcodestring;
 	}
-      else if (!(flags & F_AUTH))
-	source = "query";
+      else if (type > 0)
+	source = querystr(source, type);
       
       verb = "from";
     }

src/domain-match.c

@@ -343,7 +343,7 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
 		      else
 			{
 			  /* If we want a server for a particular domain, and this one isn't, return nothing. */
-			  if (nlow != nhigh && (flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
+			  if (nlow < daemon->serverarraysz && nlow != nhigh && (flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
 			    nlow = nhigh;
 			}
 		    }

src/inotify.c

@@ -137,14 +137,14 @@ static struct hostsfile *dyndir_addhosts(struct dyndir *dd, char *file)
 {
   /* Check if this file is already known in dd->files */
   struct hostsfile *ah;
-  size_t dirlen = sizeof(dd->dname);
+  size_t dirlen = strlen(dd->dname);
   
   /* ah->fname always starts with the string in dd->dname */
   for (ah = dd->files; ah; ah = ah->next)
-    if (ah->fname[dirlen+2] == '/' &&
-        strcmp(&ah->fname[dirlen+3], file) == 0)
+    if (ah->fname[dirlen] == '/' &&
+        strcmp(&ah->fname[dirlen+1], file) == 0)
       return ah;
-  
+        
   /* Not known, create new hostsfile record for this dyndir */
   if ((ah = whine_malloc(sizeof(struct hostsfile))))
     {