Attachment 47276 Details for Bug 106717

[patch] fix dig +trace

fix_dig.diff (text/plain), 1.64 KB, created by Dirk Mueller on 2005-08-23 18:30:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Mueller

Created: 2005-08-23 18:30:52 UTC

Size: 1.64 KB

patch

obsolete

>--- src/forward.c	2005-08-02 21:09:11.000000000 +0200
>+++ src/forward.c	2005-08-23 19:23:20.000000000 +0200
>@@ -135,7 +135,7 @@
>   
>   for (serv = daemon->servers; serv; serv=serv->next)
>     /* domain matches take priority over NODOTS matches */
>-    if ((serv->flags & SERV_FOR_NODOTS) && *type != SERV_HAS_DOMAIN && !strchr(qdomain, '.'))
>+    if ((serv->flags & SERV_FOR_NODOTS) && *type != SERV_HAS_DOMAIN && !strchr(qdomain, '.') && namelen != 0)
>       {
> 	unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; 
> 	*type = SERV_FOR_NODOTS;
>@@ -195,7 +195,7 @@
>       else
> 	log_query(F_CONFIG | F_FORWARD | flags, qdomain, *addrpp, 0, NULL, 0);
>     }
>-  else if (qtype && (daemon->options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.'))
>+  else if (qtype && (daemon->options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.') && namelen != 0)
>     flags = F_NXDOMAIN;
>     
>   if (flags == F_NXDOMAIN && check_for_local_domain(qdomain, now, daemon))
>@@ -216,13 +216,13 @@
>   char *domain = NULL;
>   int type = 0;
>   struct all_addr *addrp = NULL;
>+  unsigned int crc = questions_crc(header, (unsigned int)plen, daemon->namebuff);
>   unsigned short flags = 0;
>   unsigned short gotname = extract_request(header, (unsigned int)plen, daemon->namebuff, NULL);
>   struct server *start = NULL;
>-  unsigned int crc = questions_crc(header,(unsigned int)plen, daemon->namebuff);
>-  
>-  /* may be  recursion not speced or no servers available. */
>-  if (!header->rd || !daemon->servers)
>+    
>+  /* may be no servers available. */
>+  if (!daemon->servers)
>     forward = NULL;
>   else if ((forward = lookup_frec_by_sender(ntohs(header->id), udpaddr, crc)))
>     {

Actions: View | Diff

Attachments on bug 106717: 47276