dante: move to trunk and add myself as maintainer
[openwrt.git] / package / network / utils / dante / patches / 100-do-not-use-defdname.patch
1 --- a/lib/addressmatch.c
2 +++ b/lib/addressmatch.c
3 @@ -399,18 +399,6 @@ addrmatch(rule, address, protocol, alias
4           if (hostareeq(rule->addr.domain, hostent->h_name)
5           ||  hostisinlist(rule->addr.domain, (const char **)hostent->h_aliases))
6              matched = 1;
7 -#if !HAVE_NO_RESOLVESTUFF
8 -         else if (strchr(hostent->h_name, '.') == NULL) {
9 -            /* if hostname we got is non-qualified, try to qualify it. */
10 -            char fqdn[MAXHOSTNAMELEN];
11 -
12 -            snprintf(fqdn, sizeof(fqdn), "%s.%s",
13 -            hostent->h_name, _res.defdname);
14 -
15 -            if (hostareeq(rule->addr.domain, fqdn))
16 -               matched = 1;
17 -         }
18 -#endif /* !HAVE_NO_RESOLVESTUFF */
19        }
20  
21        if (!matched && alias) {
22 @@ -465,20 +453,6 @@ addrmatch(rule, address, protocol, alias
23                    matched = 1;
24                    break;
25                 }
26 -#if !HAVE_NO_RESOLVESTUFF
27 -               else if (strchr(ip->h_name, '.') == NULL) {
28 -                  /* if hostname we got is non-qualified, try to qualify it. */
29 -                  char fqdn[MAXHOSTNAMELEN];
30 -
31 -                  snprintf(fqdn, sizeof(fqdn), "%s.%s",
32 -                  ip->h_name, _res.defdname);
33 -
34 -                  if (hostareeq(rule->addr.domain, fqdn)) {
35 -                     matched = 1;
36 -                     break;
37 -                  }
38 -               }
39 -#endif /* !HAVE_NO_RESOLVESTUFF */
40              }
41  
42              hostentfree(host);