# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1405720887 25200
# Node ID fbbc341001ccdf5e48587eab318dedc9f97125a7
# Parent  fa657d8a56d1a8d5ebb1ee4022ca22ac3adeca18
allow broken SRS0+ rather than the correct SRS0= tag

diff -r fa657d8a56d1 -r fbbc341001cc src/dnsbl.cpp
--- a/src/dnsbl.cpp	Sat Jun 28 17:21:14 2014 -0700
+++ b/src/dnsbl.cpp	Fri Jul 18 15:01:27 2014 -0700
@@ -1106,13 +1106,13 @@
     for (int i=0; i<n; i++) key[i] = tolower(key[i]);
     if ((n > 14) && (strncmp(key, "srs", 3) == 0)) {
         // might have srs coding to be removed
-        const int nmatch = 6;
+        const int nmatch = 7;
         regmatch_t match[nmatch];
         if (0 == regexec(&srs_pattern, key, nmatch, match, 0)) {
-            int s4 = match[4].rm_so;    // domain
-            int e4 = match[4].rm_eo;
-            int s5 = match[5].rm_so;    // user
-            int e5 = match[5].rm_eo;
+            int s4 = match[5].rm_so;    // domain
+            int e4 = match[5].rm_eo;
+            int s5 = match[6].rm_so;    // user
+            int e5 = match[6].rm_eo;
             if ((s4 != -1) && (s5 != -1)) {
                 char *newkey = strdup(key);   // large enough
                 key[e4] = '\0';
@@ -1771,7 +1771,7 @@
     extern char *optarg;
 
     // setup srs coding detection
-    if (regcomp(&srs_pattern, "^srs(0|1)=([^=]+)=([^=]+)=([^=]+)=([^@]+)@", REG_ICASE | REG_EXTENDED)) {
+    if (regcomp(&srs_pattern, "^srs(0|1)(=|\+)([^=]+)=([^=]+)=([^=]+)=([^@]+)@", REG_ICASE | REG_EXTENDED)) {
         printf("cannot compile regex pattern to find srs coding in mail addresses\n");
         exit(3);
     }
diff -r fa657d8a56d1 -r fbbc341001cc tld.conf
--- a/tld.conf	Sat Jun 28 17:21:14 2014 -0700
+++ b/tld.conf	Fri Jul 18 15:01:27 2014 -0700
@@ -1,4 +1,4 @@
-// generated by make-tld-conf.py on 2014-06-28 16:46:59
+// generated by make-tld-conf.py on 2014-07-17 21:03:17
 
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7446,7 +7446,7 @@
 // no ns record for budapest
 
 // nrw : 2013-11-21 Minds + Machines GmbH
-// no ns record for nrw
+nrw
 
 // VOTE : 2013-11-21 Monolith Registry LLC
 vote
@@ -7751,7 +7751,7 @@
 trade
 
 // gent : 2014-01-23 COMBELL GROUP NV/SA
-// no ns record for gent
+gent
 
 // ing : 2014-01-23 Charleston Road Registry Inc.
 // no ns record for ing
@@ -7845,13 +7845,13 @@
 nhk
 
 // suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION
-// no ns record for suzuki
+suzuki
 
 // whoswho : 2014-02-20 Who's Who Registry
 // no ns record for whoswho
 
 // scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB""\)
-// no ns record for scb
+scb
 
 // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
 hamburg
@@ -8104,10 +8104,10 @@
 space
 
 // schmidt : 2014-04-03 SALM S.A.S. 
-// no ns record for schmidt
+schmidt
 
 // cuisinella : 2014-04-03 SALM S.A.S. 
-// no ns record for cuisinella
+cuisinella
 
 // samsung : 2014-04-03 SAMSUNG SDS CO., LTD 
 // no ns record for samsung
@@ -8128,7 +8128,7 @@
 // no ns record for erni
 
 // direct : 2014-04-10 Half Trail, LLC 
-// no ns record for direct
+direct
 
 // yandex : 2014-04-10 YANDEX, LLC 
 // no ns record for yandex
@@ -8155,7 +8155,7 @@
 // no ns record for abogado
 
 // place : 2014-04-24 Snow Galley, LLC 
-// no ns record for place
+place
 
 // tirol : 2014-04-24 punkt Tirol GmbH 
 tirol
@@ -8228,7 +8228,7 @@
 // no ns record for xn--hxt814e
 
 // cancerresearch : 2014-05-15 Australian Cancer Research Foundation 
-// no ns record for cancerresearch
+cancerresearch
 
 // everbank : 2014-05-15 EverBank 
 // no ns record for everbank
@@ -8246,7 +8246,7 @@
 // no ns record for seat
 
 // deals : 2014-05-22 Sand Sunset, LLC 
-// no ns record for deals
+deals
 
 // nra : 2014-05-22 NRA Holdings Company, INC. 
 // no ns record for nra
@@ -8262,7 +8262,7 @@
 // no ns record for bnpparibas
 
 // melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation 
-// no ns record for melbourne
+melbourne
 
 // hosting : 2014-05-29 Uniregistry, Corp. 
 // no ns record for hosting
@@ -8271,7 +8271,7 @@
 // no ns record for yoga
 
 // city : 2014-05-29 Snow Sky, LLC 
-// no ns record for city
+city
 
 // bond : 2014-06-05 Bond University Limited 
 // no ns record for bond