d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a regression in the .de and .dk whois special cases

Browse Source 
Ensure the special cases trigger whether we come via a referral
or via the -c option. Match host names case-insensitively.

Use the default character set supported by .de (UTF-8) since that
is more compatible with the modern world than ISO 8859-1. Persuade
them to give us a useful answer whether an internationalized
domain name is given in UTF-8 or in punycode.
This commit is contained in:
fanf 2016-01-23 01:20:58 +00:00
parent d92f8a19a9
commit 7e5d57d7f1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/whois/whois.c
View File

@ -61,7 +61,8 @@ __FBSDID("$FreeBSD$");
#define ABUSEHOST "whois.abuse.net"
#define ANICHOST "whois.arin.net"
#define DENICHOST "de" QNICHOST_TAIL
#define DENICHOST "whois.denic.de"
#define DKNICHOST "whois.dk-hostmaster.dk"
#define FNICHOST "whois.afrinic.net"
#define GNICHOST "whois.nic.gov"
#define IANAHOST "whois.iana.org"
@ -415,17 +416,24 @@ whois(const char *query, const char *hostname, int flags)
err(EX_OSERR, "fdopen()");
if (!(flags & WHOIS_SPAM_ME) &&
strcmp(hostname, DENICHOST) == 0)
fprintf(fp, "-T dn,ace -C ISO-8859-1 %s\r\n", query);
else if (!(flags & WHOIS_SPAM_ME) &&
strcmp(hostname, "dk" QNICHOST_TAIL) == 0)
(strcasecmp(hostname, DENICHOST) == 0 ||
strcasecmp(hostname, "de" QNICHOST_TAIL) == 0)) {
const char *q;
int idn = 0;
for (q = query; *q != '\0'; q++)
if (!isascii(*q))
idn = 1;
fprintf(fp, "-T dn%s %s\r\n", idn ? "" : ",ace", query);
} else if (!(flags & WHOIS_SPAM_ME) &&
(strcasecmp(hostname, DKNICHOST) == 0 ||
strcasecmp(hostname, "dk" QNICHOST_TAIL) == 0))
fprintf(fp, "--show-handles %s\r\n", query);
else if ((flags & WHOIS_SPAM_ME) ||
strchr(query, ' ') != NULL)
fprintf(fp, "%s\r\n", query);
else if (strcmp(hostname, ANICHOST) == 0)
else if (strcasecmp(hostname, ANICHOST) == 0)
fprintf(fp, "+ %s\r\n", query);
else if (strcmp(hostres->ai_canonname, VNICHOST) == 0)
else if (strcasecmp(hostres->ai_canonname, VNICHOST) == 0)
fprintf(fp, "domain %s\r\n", query);
else
fprintf(fp, "%s\r\n", query);