src/patches/jwhois-4.0-conf_update.patch

   1 diff -up jwhois-4.0/example/jwhois.conf.orig jwhois-4.0/example/jwhois.conf
   2 --- jwhois-4.0/example/jwhois.conf.orig 2007-03-26 11:12:08.000000000 +0200
   3 +++ jwhois-4.0/example/jwhois.conf      2010-12-20 14:26:06.450882316 +0100
   4 @@ -17,6 +17,11 @@ whois-servers {
   5         type = regex;
   6
   7         #
   8 +       # Catch ENUM domains
   9 +       #
  10 +       "\\([0-9]\\.\\)+e164\\.arpa" = "struct enum-blocks";
  11 +
  12 +       #
  13         # You can use the special value `struct' to redirect the query
  14         # to another block which optionally can use another type of matching.
  15         # Here we use it to have IPv4 numbers matched using CIDR blocks instead
  16 @@ -27,6 +32,7 @@ whois-servers {
  17         "^CORE-[0-9]+$" = "struct handles";
  18         "^CO[CH]O-[0-9]+$" = "struct handles";
  19         ".*-[A-Z]+$" = "struct handles";
  20 +       ".*-6BONE$" = "struct handles";
  21
  22         #
  23         # Catch AS numbers
  24 @@ -81,6 +87,7 @@ whois-servers {
  25         # Pseudo-ccTLDs must be listed above gTLDs
  26         #
  27         "\\.ae\\.org$" = "whois.centralnic.net";
  28 +       "\\.ar\\.com$" = "whois.centralnic.com";
  29         "\\.br\\.com$" = "whois.centralnic.net";
  30         "\\.cn\\.com$" = "whois.centralnic.net";
  31         "\\.de\\.com$" = "whois.centralnic.net";
  32 @@ -103,17 +110,30 @@ whois-servers {
  33         "\\.uy\\.com$" = "whois.centralnic.net";
  34         "\\.web\\.com$" = "whois.centralnic.net";
  35         "\\.za\\.com$" = "whois.centralnic.net";
  36 +       "\\.za\\.net$" = "whois.za.net";
  37 +        "\\.za\\.org$" = "whois.za.org";
  38
  39         "\\.ac$" = "whois.nic.ac";
  40 -       "\\.ae$" = "whois.uaenic.ae";
  41 +       "\\.ae$" = "whois.aeda.net.ae";
  42 +       "\\.co\\.ae$" = "whois.aeda.net.ae";
  43 +       "\\.net\\.ae$" = "whois.aeda.net.ae";
  44 +       "\\.org\\.ae$" = "whois.aeda.net.ae";
  45 +       "\\.sch\\.ae$" = "whois.aeda.net.ae";
  46 +       "\\.ac\\.ae$" = "whois.aeda.net.ae";
  47 +       "\\.mil\\.ae$" = "whois.aeda.net.ae";
  48 +       "\\.gov\\.ae$" = "whois.aeda.net.ae";
  49 +       "\\.1\\.7\\.9\\.e164\\.arpa$" = "whois.aeda.net.ae";
  50         "\\.aero$" = "whois.aero";
  51 -       "\\.af$" = "whois.nic.af";
  52 +       "\\.af$" = "whois.cocca.cx";
  53         "\\.ag$" = "whois.nic.ag";
  54 -       "\\.ai$" = "whois.offshore.ai";
  55 -       "\\.al$" = "whois.ripe.net";
  56 +       "\\.ai$" = "whois.ai";
  57 +       "\\.al$" = "www.ert.gov.al";
  58         "\\.am$" = "whois.amnic.net";
  59 +       "\\.edu\\.ar$" = "www.riu.edu.ar";
  60         "\\.ar$" = "www.nic.ar";
  61 +       "\\.arpa$" = "whois.iana.org";
  62         "\\.as$" = "whois.nic.as";
  63 +       "\\.asia$" = "whois.nic.asia";
  64         "\\.at$" = "whois.nic.at";
  65         "\\.asn\\.au$" = "whois.ausregistry.net.au";
  66         "\\.com\\.au$" = "whois.ausregistry.net.au";
  67 @@ -125,30 +145,40 @@ whois-servers {
  68         "\\.ba$" = "whois.ripe.net";
  69         "\\.be$" = "whois.dns.be";
  70         "\\.bg$" = "whois.register.bg";
  71 -       "\\.bi$" = "www.nic.bi";
  72 -       "\\.biz$" = "whois.neulevel.biz";
  73 +       "\\.bi$" = "whois.nic.bi";
  74 +       "\\.biz$" = "whois.biz";
  75         "\\.bj$" = "whois.nic.bj";
  76         "\\.bm$" = "rwhois.ibl.bm 4321";
  77 +       "\\.bo$" = "whois.nic.bo";
  78         "\\.br$" = "whois.nic.br";
  79 +       "\\.bs$" = "www.register.bs";
  80         "\\.bv$" = "whois.ripe.net";
  81 -       "\\.by$" = "whois.ripe.net";
  82 +       "\\.by$" = "www.domain.by";
  83         "\\.bz$" = "whois.belizenic.bz";
  84 +       "\\.co\\.ca$" = "whois.co.ca";
  85         "\\.ca$" = "whois.cira.ca";
  86         "\\.cat$" = "whois.cat";
  87 -       "\\.cc$" = "whois.nic.cc";
  88 +       "\\.cc$" {
  89 +               whois-server = "ccwhois.verisign-grs.com";
  90 +               query-format = "domain $*";
  91 +       }
  92         "\\.cd$" = "whois.nic.cd";
  93         "\\.cg$" = "www.nic.cg";
  94         "\\.ch$" = "whois.nic.ch";
  95         "\\.ci$" = "whois.nic.ci";
  96         "\\.ck$" = "whois.nic.ck";
  97         "\\.cl$" = "whois.nic.cl";
  98 +       "\\.co\\.cm$" = "whois.netcom.cm";
  99 +       "\\.com\\.cm$" = "whois.netcom.cm";
 100 +       "\\.net\\.cm$" = "whois.netcom.cm";
 101         "\\.edu\\.cn$" = "whois.edu.cn";
 102 -       "\\.cn$" = "whois.cnnic.net.cn";
 103 +       "\\.cn$" = "whois.cnnic.cn";
 104         "\\.com$" {
 105                 whois-server = "whois.verisign-grs.com";
 106                 query-format = "domain $*";
 107         }
 108         "\\.coop$" = "whois.nic.coop";
 109 +       "\\.cu$" = "www.nic.cu";
 110         "\\.cx$" = "whois.nic.cx";
 111         "\\.cy$" = "whois.ripe.net";
 112         "\\.cz$" = "whois.nic.cz";
 113 @@ -156,12 +186,15 @@ whois-servers {
 114                 whois-server = "whois.denic.de";
 115                 query-format = "-C UTF-8 -T dn,ace $*";
 116         }
 117 -       "\\.dk$" = "whois.dk-hostmaster.dk";
 118 +       "\\.dk$" {
 119 +               whois-server = "whois.dk-hostmaster.dk";
 120 +               query-format = "--show-handles $*";
 121 +       }
 122         "\\.dm$" = "whois.nic.dm";
 123         "\\.do$" = "whois.nic.do";
 124 -       "\\.dz$" = "whois.ripe.net";
 125 +       "\\.dz$" = "www.nic.dz";
 126         "\\.ec$" = "www.nic.ec";
 127 -       "\\.edu$" = "whois.educause.net";
 128 +       "\\.edu$" = "whois.educause.edu";
 129         "\\.ee$" = "whois.eenet.ee";
 130         "\\.eg$" = "whois.ripe.net";
 131         "\\.es$" = "www.nic.es";
 132 @@ -171,17 +204,20 @@ whois-servers {
 133         "\\.fm$" = "www.dot.fm";
 134         "\\.fo$" = "whois.ripe.net";
 135         "\\.fr$" = "whois.nic.fr";
 136 -       "\\.gi$" = "www.nic.gi";
 137 +       "\\.gd$" = "whois.adamsnames.com";
 138 +       "\\.gi$" = "whois2.afilias-grs.net";
 139         "\\.gov$" = "whois.nic.gov";
 140 -       "\\.gg$" = "whois.isles.net";
 141 +       "\\.gg$" = "whois.gg";
 142         "\\.gm$" = "whois.ripe.net";
 143         "\\.gp$" = "whois.nic.gp";
 144         "\\.gr$" = "whois.ripe.net";
 145 -       "\\.gs$" = "203.119.12.22";
 146 +       "\\.gs$" = "whois.nic.gs";
 147         "\\.gt$" = "www.gt";
 148 -       "\\.hk$" = "whois.hkdnr.net.hk";
 149 +       "\\.hk$" = "whois.hkirc.hk";
 150         "\\.hm$" = "whois.registry.hm";
 151 +       "\\.hn$" = "whois2.afilias-grs.net";
 152         "\\.hr$" = "www.dns.hr";
 153 +       "\\.ht$" = "whois.nic.ht";
 154         "\\.hu$" = "whois.nic.hu";
 155         "\\.id$" = "whois.idnic.net.id";
 156         "\\.ie$" = "whois.domainregistry.ie";
 157 @@ -195,69 +231,94 @@ whois-servers {
 158         "\\.is$" = "whois.isnic.is";
 159         "\\.it$" = "whois.nic.it";
 160         "\\.je$" = "whois.isles.net";
 161 +       "\\.jobs$" {
 162 +                whois-server = "jobswhois.verisign-grs.com";
 163 +                query-format = "domain $*";
 164 +       }
 165         "\\.jp$" {
 166                 whois-server = "whois.jprs.jp";
 167                 query-format = "$* /e";
 168         }
 169 +       "\\.ke$" = "whois.kenic.or.ke";
 170 +       "\\.kp$" = "whois.kcce.kp";
 171         "\\.kg$" = "whois.domain.kg";
 172 -       "\\.ki$" = "whois.nic.ki";
 173 +       "\\.ki$" = "whois.cocca.cx";
 174         "\\.kr$" = "whois.krnic.net";
 175         "\\.kz$" = "whois.nic.kz";
 176         "\\.la$" = "whois.nic.la";
 177         "\\.lb$" = "cgi.aub.edu.lb";
 178 +       "\\.lc$" = "whois2.afilias-grs.net";
 179         "\\.li$" = "whois.nic.li";
 180         "\\.lk$" = "whois.nic.lk";
 181         "\\.lt$" = "whois.domreg.lt";
 182         "\\.lu$" = "whois.dns.lu";
 183         "\\.lv$" = "whois.nic.lv";
 184         "\\.ly$" = "whois.nic.ly";
 185 -       "\\.ma$" = "whois.ripe.net";
 186 +       "\\.ma$" = "whois.iam.net.ma";
 187 +       "\\.md$" = "whois.nic.md";
 188 +       "\\.me$" = "whois.nic.me";
 189         "\\.mil$" = "whois.nic.mil";
 190         "\\.mk$" = "whois.ripe.net";
 191         "\\.mm$" = "whois.nic.mm";
 192 +       "\\.mn$" = "whois2.afilias-grs.net";
 193         "\\.mobi$" = "whois.dotmobiregistry.net";
 194 -       "\\.ms$" = "whois.adamsnames.tc";
 195 -       "\\.mt$" = "www.um.edu.mt";
 196 +       "\\.ms$" = "whois.nic.ms";
 197 +       "\\.mt$" = "whois.nic.org.mt";
 198         "\\.mu$" = "whois.nic.mu";
 199         "\\.museum$" = "whois.museum";
 200         "\\.mw$" = "www.tarsus.net";
 201         "\\.mx$" = "whois.nic.mx";
 202 -       "\\.my$" = "whois.mynic.net.my";
 203 +       "\\.my$" = "whois.domainregistry.my";
 204         "\\.na$" = "whois.na-nic.com.na";
 205 -       "\\.name$" = "whois.nic.name";
 206 +       "\\.name$" {
 207 +               whois-server = "whois.nic.name";
 208 +               query-format = "domain = $*";
 209 +               }
 210         "\\.net$" {
 211                 whois-server = "whois.verisign-grs.com";
 212                 query-format = "domain $*";
 213         }
 214 -       "\\.ng$" = "whois.rg.net";
 215 +       "\\.nf$" = "whois.cocca.cx";
 216 +       "\\.ng$" = "whois.nic.net.ng";
 217         "\\.nl$" = "whois.domain-registry.nl";
 218         "\\.no$" = "whois.norid.no";
 219         "\\.nu$" = "whois.nic.nu";
 220         "\\.nz$" = "whois.srs.net.nz";
 221         "\\.org$" = "whois.publicinterestregistry.net";
 222 -       "\\.pe$" = "whois.nic.pe";
 223 +       "\\.pa$" = "www.nic.pa";
 224 +       "\\.pe$" = "kero.yachay.pe";
 225         "\\.pk$" = "pknic.net.pk";
 226         "\\.pl$" = "whois.dns.pl";
 227         "\\.pm$" = "whois.nic.pm";
 228 +       "\\.pr$" = "whois.nic.pr";
 229         "\\.pro$" = "whois.registrypro.pro";
 230 +       "\\.ps$" = "www.nic.ps";
 231         "\\.pt$" = "whois.dns.pt";
 232         "\\.pw$" = "whois.nic.pw";
 233         "\\.re$" = "whois.nic.re";
 234         "\\.ro$" = "whois.rotld.ro";
 235 +       "\\.edu\.ru$" = "whois.informika.ru";
 236         "\\.ru$" = "whois.ripn.net";
 237         "\\.rw$" = "www.nic.rw";
 238         "\\.sa$" = "saudinic.net.sa";
 239 +       "\\.sb$" = "whois.nic.sb";
 240 +       "\\.sc$" = "whois2.afilias-grs.net";
 241         "\\.se$" = "whois.iis.se";
 242 -       "\\.sg$" = "whois.nic.net.sg";
 243 +       "\\.sg$" = "whois.sgnic.sg";
 244         "\\.sh$" = "whois.nic.sh";
 245         "\\.si$" = "whois.arnes.si";
 246         "\\.sj$" = "whois.ripe.net";
 247 -       "\\.sk$" = "whois.ripe.net";
 248 +       "\\.sk$" = "whois.sk-nic.sk";
 249 +       "\\.sl$" = "whois.nic.sl";
 250         "\\.sm$" = "whois.ripe.net";
 251 +       "\\.sn$" = "whois.nic.sn";
 252 +       "\\.so$" = "whois.nic.so";
 253         "\\.sr$" = "whois.register.sr";
 254         "\\.st$" = "whois.nic.st";
 255         "\\.su$" = "whois.ripn.net";
 256 +       "\\.sv$" = "www.svnet.org.sv";
 257         "\\.tc$" = "whois.adamsnames.tc";
 258 +       "\\.tel$" = "whois.nic.tel";
 259         "\\.tf$" = "whois.afnic.fr";
 260         "\\.tg$" = "www.nic.tg";
 261         "\\.th$" = "whois.thnic.net";
 262 @@ -268,8 +329,12 @@ whois-servers {
 263         "\\.tn$" = "whois.ripe.net";
 264         "\\.to$" = "whois.tonic.to";
 265         "\\.tr$" = "whois.nic.tr";
 266 +       "\\.travel$" = "whois.nic.travel";
 267         "\\.tt$" = "www.nic.tt";
 268 -       "\\.tv$" = "whois.nic.tv";
 269 +       "\\.tv$" {
 270 +               whois-server = "tvwhois.verisign-grs.com";
 271 +               query-format = "domain $*";
 272 +        }
 273         "\\.tw$" = "whois.twnic.net";
 274         "\\.ua$" = "whois.com.ua";
 275         "\\.ug$" = "whois.co.ug";
 276 @@ -279,9 +344,12 @@ whois-servers {
 277         "\\.fed\\.us$" = "whois.nic.gov";
 278         "\\.us$" = "whois.nic.us";
 279         "\\.com\\.uy$" = "dns.antel.net.uy";
 280 -       "\\.uy$" = "www.rau.edu.uy"; # is a whois server
 281 -       "\\.uz$" = "www.noc.uz";
 282 +       "\\.uy$" = "whois.nic.org.uy";
 283 +       "\\.co\\.uz$" = "whois.reg.uz";
 284 +       "\\.com\\.uz$" = "whois.reg.uz";
 285 +       "\\.uz$" = "whois.cctld.uz";
 286         "\\.va$" = "whois.ripe.net";
 287 +       "\\.vc$" = "whois2.afilias-grs.net";
 288         "\\.ve$" = "whois.nic.ve";
 289         "\\.vi$" = "www.nic.vi";
 290         "\\.vg$" = "whois.adamsnames.tc";
 291 @@ -289,12 +357,15 @@ whois-servers {
 292         "\\.vu$" = "www.vunic.vu";
 293         "\\.wf$" = "whois.nic.wf";
 294         "\\.ws$" = "whois.worldsite.ws";
 295 +       "\\.xn--mgbaam7a8h$" = "whois.aeda.net.ae";
 296         "\\.yt$" = "whois.nic.yt";
 297 -       "\\.yu$" = "whois.ripe.net";
 298 +       "\\.yu$" = "www.nic.yu";
 299         "\\.ac\\.za$" = "whois.ac.za";
 300         "\\.org\\.za$" = "rwhois.org.za 4321";
 301         "\\.co\\.za$" = "whois.co.za";
 302 +       "\\.nom\\.za$" = "www.nom.za";
 303         # "\\.za$" = "whois.frd.ac.za";
 304 +       "\\.co\\.zw$" = "www.zispa.co.zw";
 305
 306         #
 307         # Specify different port numbers to connect to by postfixing the IP
 308 @@ -311,6 +382,16 @@ whois-servers {
 309  }
 310
 311  #
 312 +# enum-blocks
 313 +#
 314 +enum-blocks {
 315 +       type = regex;
 316 +
 317 +       "\\.9\\.4\\.e164\\.arpa$" = "whois.enum.denic.de";
 318 +       "\\.1\\.6\\.e164\\.arpa$" = "whois-check.enum.com.au";
 319 +}
 320 +
 321 +#
 322  # cidr-blocks contains a list of all known CIDR blocks assigned to
 323  # RIPE or APNIC. Default all queries to ARIN which has most other blocks.
 324  #
 325 @@ -580,7 +661,7 @@ cidr-blocks {
 326  cidr6-blocks {
 327         type = cidr6;
 328
 329 -       "2001:0000::/23" = "whois.iana.org";
 330 +       "2001:0000::/23" = "whois.iana.org"; # correct, but nothing usable is returned
 331         "2001:0200::/23" = "whois.apnic.net";
 332         "2001:0400::/23" = "whois.arin.net";
 333         "2001:0600::/23" = "whois.ripe.net";
 334 @@ -593,13 +674,13 @@ cidr6-blocks {
 335         "2001:1600::/23" = "whois.ripe.net";
 336         "2001:1800::/23" = "whois.arin.net";
 337         "2001:1A00::/23" = "whois.ripe.net";
 338 -       "2001:1C00::/23" = "whois.ripe.net";
 339 -       "2001:1E00::/23" = "whois.ripe.net";
 340 +       "2001:1C00::/22" = "whois.ripe.net";
 341         "2001:2000::/20" = "whois.ripe.net";
 342         "2001:3000::/21" = "whois.ripe.net";
 343         "2001:3800::/22" = "whois.ripe.net";
 344 +       "2001:3C00::/22" = "whois.arin.net"; # not correct, but shows better information
 345         "2001:4000::/23" = "whois.ripe.net";
 346 -       "2001:4200::/23" = "whois.arin.net";
 347 +       "2001:4200::/23" = "whois.afrinic.net";
 348         "2001:4400::/23" = "whois.apnic.net";
 349         "2001:4600::/23" = "whois.ripe.net";
 350         "2001:4800::/23" = "whois.arin.net";
 351 @@ -610,23 +691,47 @@ cidr6-blocks {
 352         "2001:A000::/20" = "whois.apnic.net";
 353         "2001:B000::/20" = "whois.apnic.net";
 354
 355 +       "2002:0000::/16" = "whois.arin.net"; # not correct, but shows better information
 356 +
 357         "2003:0000::/18" = "whois.ripe.net";
 358
 359 -       "2400:0000::/19" = "whois.apnic.net";
 360 -       "2400:2000::/19" = "whois.apnic.net";
 361 -       "2400:4000::/21" = "whois.apnic.net";
 362 -       "2404:0000::/23" = "whois.apnic.net";
 363 -
 364 -       "2600:0000::/22" = "whois.arin.net";
 365 -       "2604:0000::/22" = "whois.arin.net";
 366 -       "2608:0000::/22" = "whois.arin.net";
 367 -       "260C:0000::/22" = "whois.arin.net";
 368 +       "2400:0000::/12" = "whois.apnic.net";
 369 +
 370 +       "2600:0000::/12" = "whois.arin.net";
 371         "2610:0000::/23" = "whois.arin.net";
 372 +       "2620:0000::/23" = "whois.arin.net";
 373 +
 374 +       "2800:0000::/12" = "whois.lacnic.net";
 375
 376 -       "2800:0000::/23" = "whois.lacnic.net";
 377 +       "2C00:0000::/12" = "whois.afrinic.net";
 378
 379 -       "2A00:0000::/21" = "whois.ripe.net";
 380 -       "2A01:0000::/16" = "whois.ripe.net";
 381 +       #
 382 +       # IPv6 blocks by carriers used for SixXS;
 383 +       # see e.g. http://www.sixxs.net/pops/
 384 +       #
 385 +       "2001:0610::/32" = "whois.sixxs.net";
 386 +       "2001:06A0::/32" = "whois.sixxs.net";
 387 +       "2001:06A8::/32" = "whois.sixxs.net";
 388 +       "2001:06F8::/32" = "whois.sixxs.net";
 389 +       "2001:0770::/32" = "whois.sixxs.net";
 390 +       "2001:07B8::/32" = "whois.sixxs.net";
 391 +       "2001:0808::/32" = "whois.sixxs.net";
 392 +       "2001:0838::/32" = "whois.sixxs.net";
 393 +       "2001:0960::/32" = "whois.sixxs.net";
 394 +       "2001:0A60::/32" = "whois.sixxs.net";
 395 +       "2001:0AD0::/32" = "whois.sixxs.net";
 396 +       "2001:0B18::/32" = "whois.sixxs.net";
 397 +       "2001:1418::/32" = "whois.sixxs.net";
 398 +       "2001:14B8::/32" = "whois.sixxs.net";
 399 +       "2001:15C0::/32" = "whois.sixxs.net";
 400 +       "2001:16D8::/32" = "whois.sixxs.net";
 401 +       "2001:1938::/32" = "whois.sixxs.net";
 402 +       "2001:4830::/32" = "whois.sixxs.net";
 403 +       "2001:4978::/32" = "whois.sixxs.net";
 404 +       "2001:41E0::/32" = "whois.sixxs.net";
 405 +       "2001:4428::/32" = "whois.sixxs.net";
 406 +       "2A01:0198::/32" = "whois.sixxs.net";
 407 +       "2A01:0348::/32" = "whois.sixxs.net";
 408
 409         #
 410         # Experimental IPv6 network 6bone (RFC2471)
 411 @@ -662,7 +767,7 @@ handles {
 412         ".*-NICAT$" = "whois.nic.at";
 413         ".*-CZ$" = "whois.nic.cz";
 414         ".*-NICIR$" = "whois.nic.ir";
 415 -       ".*-UYNIC$" = "www.rau.edu.uy";
 416 +       ".*-UYNIC$" = "whois.nic.org.uy";
 417         ".*-ITNIC$" = "whois.nic.it";
 418         ".*-FRNIC$" = "whois.nic.fr";
 419         ".*-LACNIC$" = "whois.lacnic.net";
 420 @@ -671,6 +776,49 @@ handles {
 421                 whois-server = "saudinic.net.sa";
 422                 query-format = "PERSON $*";
 423         }
 424 +       ".*-SIXXS$" = "whois.sixxs.net";
 425 +       ".*-6BONE$" = "whois.6bone.net";
 426 +       ".*-IRNIC$" = "whois.nic.ir";
 427 +       ".*-RIPN$" = "whois.ripn.net";
 428 +       ".*-AFRINIC$" = "whois.afrinic.net";
 429 +       "^C[0-9]+-LRMS$" {
 430 +               whois-server = "whois.afilias.info";
 431 +               query-format = "CONTACT ID $*";
 432 +       }
 433 +       "^D[0-9]+-LRMS$" {
 434 +               whois-server = "whois.afilias.info";
 435 +               query-format = "DOMAIN ID $*";
 436 +       }
 437 +       "^H[0-9]+-LRMS$" {
 438 +               whois-server = "whois.afilias.info";
 439 +               query-format = "HOST ID $*";
 440 +       }
 441 +       "^R[0-9]+-LRMS$" {
 442 +               whois-server = "whois.afilias.info";
 443 +               query-format = "REGISTRAR ID $*";
 444 +       }
 445 +       ".*-KENIC$" = "whois.kenic.or.ke";
 446 +       ".*-UANIC$" = "whois.com.ua";
 447 +       ".*-COOP$" {
 448 +               whois-server = "whois.nic.coop";
 449 +               query-format = "CONTACT $*";
 450 +       }
 451 +       ".*CONTACT-NAME$" {
 452 +               whois-server = "whois.nic.name";
 453 +               query-format = "contact = $*";
 454 +       }
 455 +       ".*REGISTRAR-NAME$" {
 456 +               whois-server = "whois.nic.name";
 457 +               query-format = "registrar = $*";
 458 +       }
 459 +       "^C[0-9]+-AERO$" {
 460 +               whois-server = "whois.aero";
 461 +               query-format = "CONTACT ID $*";
 462 +       }
 463 +       "^D[0-9]+-AERO$" {
 464 +               whois-server = "whois.aero";
 465 +               query-format = "DOMAIN ID $*";
 466 +       }
 467  }
 468
 469  #
 470 @@ -678,11 +826,6 @@ handles {
 471  # each host.
 472  #
 473  server-options {
 474 -       "rwhois\\.nic\\.ve" {
 475 -               rwhois = true;
 476 -               rwhois-display = "dump";
 477 -               rwhois-limit = 10;
 478 -       }
 479         "rwhois\\.exodus\\.net" {
 480                 rwhois = true;
 481         }
 482 @@ -754,13 +897,6 @@ server-options {
 483                 form-element = "name";
 484         }
 485
 486 -       "www\\.um\\.edu\\.mt" {
 487 -               http = "true";
 488 -               http-method = "GET";
 489 -               http-action = "/cgi-bin/nic/whois";
 490 -               form-element = "domain";
 491 -       }
 492 -
 493         "www\\.gt" {
 494                 http = "true";
 495                 http-method = "GET";
 496 @@ -777,13 +913,6 @@ server-options {
 497                 query-format = "Upit=${+2}"; # All but last domain segment
 498         }
 499
 500 -       "whois\\.offshore\\.ai" {
 501 -               http = "true";
 502 -               http-method = "POST";
 503 -               http-action = "/cgi-bin/whois.pl";
 504 -               form-element = "domain-name";
 505 -       }
 506 -
 507         "www\\.io\\.io" {
 508                 http = "true";
 509                 http-method = "GET";
 510 @@ -813,11 +942,12 @@ server-options {
 511                 form-element = "query";
 512         }
 513
 514 -       "www\\.nic\\.bi" {
 515 -               http = "true";
 516 -               http-method = "POST";
 517 -               http-action = "/cgi-bin/whoisbi.pl"; # Formatting problems in Lynx
 518 -               form-element = "DOMAINWHOIS";
 519 +       "whois\\.nic\\.bi" {
 520 +               http = "true"; # I can't connect on port 43
 521 +               http-method = "GET";
 522 +               http-action = "/register/whois.hei";
 523 +               form-element = "query";
 524 +               form-extra = "type=domain";
 525         }
 526
 527         "www\\.nic\\.cg" {
 528 @@ -848,13 +978,6 @@ server-options {
 529                 form-element = "name";
 530         }
 531
 532 -       "www\\.noc\\.uz" {
 533 -               http = "true";
 534 -               http-method = "POST";
 535 -               http-action = "/whois.php4";
 536 -               form-element = "dname";
 537 -       }
 538 -
 539         "www\\.nic\\.vi" {
 540                 http = "true";
 541                 http-method = "POST";
 542 @@ -878,9 +1001,9 @@ server-options {
 543
 544         "www\\.nic\\.tg" {
 545                 http = "true";
 546 -               http-method = "GET";
 547 -               http-action = "/moteur/info_dom.php";
 548 -               form-element = "domaine";
 549 +               http-method = "POST";
 550 +               http-action = "/nictg/indexplus.php?pg=verifdom&op=whois";
 551 +               query-format = "tosearch=${+2}&typedom=.tg";
 552         }
 553
 554         "cgi\\.aub\\.edu\\.lb" {
 555 @@ -910,33 +1033,152 @@ server-options {
 556                 form-element = "nombre";
 557         }
 558
 559 -       "www\\.denic\\.de" {
 560 -               http = "true";
 561 -               http-method = "POST";
 562 -               http-action = "/en/whois/data.jsp";
 563 -               form-element = "domainname";
 564 -               form-extra = "service=WhoisData&lang=en&submit=Accept";
 565 -       }
 566         "whois\\.denic\\.de" {
 567                 whois-server = "whois.denic.de";
 568                 query-format = "-C UTF-8 -T dn,ace $*";
 569                 answer-charset = "UTF-8";
 570         }
 571 +
 572 +       "whois\\.enum\\.denic\\.de" {
 573 +               whois-server = "whois.enum.denic.de";
 574 +               query-format = "-C UTF-8 -T dn $*";
 575 +               answer-charset = "UTF-8";
 576 +       }
 577 +
 578         "whois\\.nic\\.ad\\.jp" {
 579                 query-format = "$*/e";
 580         }
 581 +
 582         "whois\\.nic\\.ch" {
 583                 answer-charset = "UTF-8";
 584         }
 585 +
 586         "whois\\.nic\\.li" {
 587                 answer-charset = "UTF-8";
 588         }
 589 +
 590         "whois\\.centralnic\\.*" {
 591                  whois-redirect = ".*Whois Server: \\(.*\\)";
 592          }
 593 +
 594         ".*\\.verisign-grs\\.com" {
 595                 whois-redirect = ".*Whois Server: \\(.*\\)";
 596         }
 597 +
 598 +       "whois\\.sixxs\\.net" {
 599 +               whois-redirect = ".*ReferralServer: whois:\/\/\\(.*\\)";
 600 +        }
 601 +
 602 +       "whois2\\.afilias-grs\\.net" {
 603 +               whois-redirect = "Whois Server:\\(.*\\)";
 604 +       }
 605 +
 606 +       "whois\\.registrar\\.telekom\\.de" {
 607 +               query-format = "full $*";
 608 +       }
 609 +
 610 +       "whois\\.rrpproxy\\.net" {
 611 +               answer-charset = "UTF-8";
 612 +       }
 613 +
 614 +       "www\\.nom\\.za" {
 615 +               http = "true";
 616 +               http-method = "POST";
 617 +               http-action = "/do.php";
 618 +               query-format = "chkDomain=${+3}&chkAvail=Check";
 619 +       }
 620 +
 621 +       "www\\.nic\\.pa" {
 622 +               http = "true";
 623 +               http-method = "GET";
 624 +               http-action = "/egh/whois.php";
 625 +               form-element = "nombre_d";
 626 +       }
 627 +
 628 +       "www\\.nic\\.dz" {
 629 +               http = "true";
 630 +               http-method = "POST";
 631 +               http-action = "/index.php?option=com_content&task=view&id=37&Itemid=51";
 632 +               form-element = "domain_name";
 633 +       }
 634 +
 635 +       "www\\.nic\\.yu" {
 636 +               http = "true";
 637 +               http-method = "GET";
 638 +               http-action = "/cgi-bin/checkavail.cgi";
 639 +               form-element = "domain";
 640 +       }
 641 +
 642 +       "whois\\.dotster\\.com" {
 643 +               answer-charset = "UTF-8";
 644 +       }
 645 +
 646 +       "www\\.ert\\.gov\\.al" {
 647 +               http = "true";
 648 +               http-method = "POST";
 649 +               http-action = "/ert_eng/domain_res.html";
 650 +               query-format = "Domain=${+2}";
 651 +       }
 652 +
 653 +       "www\\.nic\\.cu" {
 654 +               http = "true";
 655 +               http-method = "GET";
 656 +               http-action = "/dom_det.php";
 657 +               form-element = "domsrch";
 658 +       }
 659 +
 660 +       "www\\.nic\\.ps" {
 661 +               http = "true";
 662 +               http-method = "GET";
 663 +               http-action = "/whois/domain_whois.php";
 664 +               form-element = "dname";
 665 +       }
 666 +
 667 +       "www\\.svnet\\.org\\.sv" {
 668 +               http = "true";
 669 +               http-method = "POST";
 670 +               http-action = "/registro/consultas/whois.php";
 671 +               form-element = "subdominio";
 672 +       }
 673 +
 674 +       "www\\.zispa\\.co\\.zw" {
 675 +               http = "true";
 676 +               http-method = "GET";
 677 +               http-action = "/cgi-bin/search";
 678 +               form-element = "domain";
 679 +       }
 680 +
 681 +       "www\\.riu\\.edu\\.ar" {
 682 +               http = "true";
 683 +               http-method = "POST";
 684 +               http-action = "/cgi-bin/verdom.pl.nuevo";
 685 +               query-format = "username=${+3}";
 686 +       }
 687 +
 688 +       "www\\.register\\.bs" {
 689 +               http = "true";
 690 +               http-method = "POST";
 691 +               http-action = "/cgi-bin/search.pl";
 692 +               form-element = "name";
 693 +       }
 694 +
 695 +       "www\\.domain\\.by" {
 696 +               http = "true";
 697 +               http-method = "POST";
 698 +               http-action = "/cgi-bin/registry.cgi";
 699 +               query-format = "domain=${+2}&lang=e&mode=slquest";
 700 +       }
 701 +
 702 +       "www\\.nic\\.ac" {
 703 +               http = "true";
 704 +               http-method = "GET";
 705 +               http-action = "/cgi-bin/whois";
 706 +               form-element = "textfield";
 707 +       }
 708 +
 709 +       "whois\\.1api\\.net" {
 710 +               answer-charset = "UTF-8";
 711 +       }
 712  }
 713
 714  #