From d96160845111810ff5fb43abf384cfa4c204f8f7 Mon Sep 17 00:00:00 2001 From: Marco d'Itri Date: Wed, 15 Oct 2014 15:20:04 +0200 Subject: [PATCH] Convert tld_serv_list to in_domain() --- make_tld_serv.pl | 2 +- whois.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make_tld_serv.pl b/make_tld_serv.pl index 6afa03e..c962015 100755 --- a/make_tld_serv.pl +++ b/make_tld_serv.pl @@ -10,7 +10,7 @@ while (<>) { next if /^$/; die "format error: $_" if not - (my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/); + (my ($a, $b) = /^\.(\w[\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/); $b =~ s/^W(?:EB)?\s+/\\x01/; $b =~ s/^VERISIGN\s+/\\x04" "/; diff --git a/whois.c b/whois.c index 3345535..7cb54bc 100644 --- a/whois.c +++ b/whois.c @@ -524,7 +524,7 @@ char *guess_server(const char *s) /* check the TLDs list */ for (i = 0; tld_serv[i]; i += 2) - if (domcmp(s, tld_serv[i])) + if (in_domain(s, tld_serv[i])) return strdup(tld_serv[i + 1]); /* use the default server name for "new" gTLDs */