postfix-3.2-20160604

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 617174d71a47cd7db1fac4018883e591f3685399..d2844ae3bdf59533cde83f491f15ee21f58960de 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -22327,3 +22327,15 @@ Apologies for any names omitted.
 
        Cleanup: make regexp: and pcre: parser warning messages more
        similar.  Files: dict_regexp.c, dict_pcre.c.
+
+20160601
+
+       Cleanup: moved parsing of '!' operators from cidr_match.c
+       to dict_cidr.c. Files: util/cidr_match.[hc], util/dict_cidr.c,
+       util/match_ops.c.
+
+20160604
+
+       Cleanup: made parsing of '!' operators in regexp and pcre
+       tables consistent with cidr tables. Files: util/dict_regexp.c,
+       util/dict_pcre.c.

diff --git a/postfix/WISHLIST b/postfix/WISHLIST
index 44eb73c831c67024879c0e865540bf980f19deda..cf2f0de8231469893185b8baea9d0c26ac82e6e1 100644 (file)
--- a/postfix/WISHLIST
+++ b/postfix/WISHLIST
@@ -17,6 +17,8 @@ Wish list:
 
        Fix "make test" bitrot.
 
+       Move DNS-based tests from porcupine.org to postfix.org.
+
        Document dns_ncache_ttl_fix_enable use case in POSTSCREEN_README
        and RELEASE_NOTES.
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 00b7d7b4151be01450a82fa305a7149fc46665ae..b6f8b3b0f2a716dd862b089d7d941faaf69acd3c 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20160527"
+#define MAIL_RELEASE_DATE      "20160604"
 #define MAIL_VERSION_NUMBER    "3.2"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/util/cidr_match.c b/postfix/src/util/cidr_match.c
index 7a921d75ffb7c7266fddf395c3797cdc3bea1985..f585bfb002f8c76fbd0f75e0a651e73abf6d51d4 100644 (file)
--- a/postfix/src/util/cidr_match.c
+++ b/postfix/src/util/cidr_match.c
@@ -6,7 +6,7 @@
 /* SYNOPSIS
 /*     #include <cidr_match.h>
 /*
-/*     VSTRING *cidr_match_parse(info, pattern, why)
+/*     VSTRING *cidr_match_parse(info, pattern, match, why)
 /*     CIDR_MATCH *info;
 /*     char    *pattern;
 /*     VSTRING *why;
@@ -15,9 +15,9 @@
 /*     CIDR_MATCH *info;
 /*     const char *address;
 /* AUXILIARY FUNCTIONS
-/*     VSTRING *cidr_match_parse_if(info, address, why)
+/*     VSTRING *cidr_match_parse_if(info, pattern, match, why)
 /*     CIDR_MATCH *info;
-/*     char    *address;
+/*     char    *pattern;
 /*     VSTRING *why;
 /*
 /*     void    cidr_match_endif(info)
@@ -32,6 +32,9 @@
 /*
 /*     cidr_match_parse() parses an address or address/mask
 /*     expression and stores the result into the info argument.
+/*     A non-zero (or zero) match argument requests a positive (or
+/*     negative) match. The symbolic constants CIDR_MATCH_TRUE and
+/*     CIDR_MATCH_FALSE may help to improve code readability.
 /*     The result is non-zero in case of problems: either the
 /*     value of the why argument, or a newly allocated VSTRING
 /*     (the caller should give the latter to vstring_free()).
@@ -39,6 +42,7 @@
 /*
 /*     cidr_match_parse_if() parses the address that follows an IF
 /*     token, and stores the result into the info argument.
+/*     The arguments are the same as for cidr_match_parse().
 /*
 /*     cidr_match_endif() handles the occurrence of an ENDIF token,
 /*     and updates the info argument.
@@ -179,7 +183,8 @@ CIDR_MATCH *cidr_match_execute(CIDR_MATCH *list, const char *addr)
 
 /* cidr_match_parse - parse CIDR pattern */
 
-VSTRING *cidr_match_parse(CIDR_MATCH *ip, char *pattern, VSTRING *why)
+VSTRING *cidr_match_parse(CIDR_MATCH *ip, char *pattern, int match,
+                                 VSTRING *why)
 {
     const char *myname = "cidr_match_parse";
     char   *mask_search;
@@ -188,23 +193,6 @@ VSTRING *cidr_match_parse(CIDR_MATCH *ip, char *pattern, VSTRING *why)
     unsigned char *np;
     unsigned char *mp;
 
-    /*
-     * Process negation operators. XXX unlike dict_regexp_get_pat() and
-     * dict_pcre_get_pattern(), dict_cidr_parse_rule() does not allow space
-     * between ! and the remainder of a pattern. However, those spaces are
-     * not documented, they were more a helpful thing.
-     */
-    ip->match = 1;
-    while (*pattern == '!') {
-       ip->match = !ip->match;
-       pattern++;
-    }
-
-    if (*pattern == 0) {
-       vstring_sprintf(why ? why : (why = vstring_alloc(20)), "no pattern");
-       return (why);
-    }
-
     /*
      * Strip [] from [addr/len] or [addr]/len, destroying the pattern. CIDR
      * maps don't need [] to eliminate syntax ambiguity, but matchlists need
@@ -289,6 +277,7 @@ VSTRING *cidr_match_parse(CIDR_MATCH *ip, char *pattern, VSTRING *why)
      * Wrap up the result.
      */
     ip->op = CIDR_MATCH_OP_MATCH;
+    ip->match = match;
     ip->next = 0;
     ip->block_end = 0;
 
@@ -297,11 +286,12 @@ VSTRING *cidr_match_parse(CIDR_MATCH *ip, char *pattern, VSTRING *why)
 
 /* cidr_match_parse_if - parse CIDR pattern after IF */
 
-VSTRING *cidr_match_parse_if(CIDR_MATCH *ip, char *pattern, VSTRING *why)
+VSTRING *cidr_match_parse_if(CIDR_MATCH *ip, char *pattern, int match,
+                                    VSTRING *why)
 {
     VSTRING *ret;
 
-    if ((ret = cidr_match_parse(ip, pattern, why)) == 0)
+    if ((ret = cidr_match_parse(ip, pattern, match, why)) == 0)
        ip->op = CIDR_MATCH_OP_IF;
     return (ret);
 }

diff --git a/postfix/src/util/cidr_match.h b/postfix/src/util/cidr_match.h
index 1fab97671e3290f6013eb223b9ac255ea60c6516..22f16a08acc92fc2c8e62d2ef519330e25169ee4 100644 (file)
--- a/postfix/src/util/cidr_match.h
+++ b/postfix/src/util/cidr_match.h
@@ -54,8 +54,11 @@ typedef struct CIDR_MATCH {
 #define CIDR_MATCH_OP_IF       2       /* Increase if/endif nesting on match */
 #define CIDR_MATCH_OP_ENDIF    3       /* Decrease if/endif nesting on match */
 
-extern VSTRING *cidr_match_parse(CIDR_MATCH *, char *, VSTRING *);
-extern VSTRING *cidr_match_parse_if(CIDR_MATCH *, char *, VSTRING *);
+#define CIDR_MATCH_TRUE                1       /* Request positive match */
+#define CIDR_MATCH_FALSE       0       /* Request negative match */
+
+extern VSTRING *cidr_match_parse(CIDR_MATCH *, char *, int, VSTRING *);
+extern VSTRING *cidr_match_parse_if(CIDR_MATCH *, char *, int, VSTRING *);
 extern void cidr_match_endif(CIDR_MATCH *);
 
 extern CIDR_MATCH *cidr_match_execute(CIDR_MATCH *, const char *);

diff --git a/postfix/src/util/dict_cidr.c b/postfix/src/util/dict_cidr.c
index 112582bc6cf2a6e810c5266904e4a73d11a0e65c..62634e2795c17784ac33acfda53e43efb975492d 100644 (file)
--- a/postfix/src/util/dict_cidr.c
+++ b/postfix/src/util/dict_cidr.c
@@ -121,20 +121,26 @@ static DICT_CIDR_ENTRY *dict_cidr_parse_rule(char *p, int lineno, int nesting,
     char   *value;
     CIDR_MATCH cidr_info;
     MAI_HOSTADDR_STR hostaddr;
+    int     match = 1;
 
     /*
      * IF must be followed by a pattern.
      */
     if (strncasecmp(p, "IF", 2) == 0 && !ISALNUM(p[2])) {
        p += 2;
-       while (*p && ISSPACE(*p))               /* Skip whitespace */
+       for (;;) {
+           if (*p == '!')
+               match = !match;
+           else if (!ISSPACE(*p))
+               break;
            p++;
+       }
        if (*p == 0) {
            vstring_sprintf(why, "no address pattern");
            return (0);
        }
        trimblanks(p, 0)[0] = 0;                /* Trim trailing blanks */
-       if (cidr_match_parse_if(&cidr_info, p, why) != 0)
+       if (cidr_match_parse_if(&cidr_info, p, match, why) != 0)
            return (0);
        value = "";
     }
@@ -163,6 +169,17 @@ static DICT_CIDR_ENTRY *dict_cidr_parse_rule(char *p, int lineno, int nesting,
      */
     else {
 
+       /*
+        * Process negation operators.
+        */
+       for (;;) {
+           if (*p == '!')
+               match = !match;
+           else if (!ISSPACE(*p))
+               break;
+           p++;
+       }
+
        /*
         * Split the rule into key and value. We already eliminated leading
         * whitespace, comments, empty lines or lines with whitespace only.
@@ -185,7 +202,7 @@ static DICT_CIDR_ENTRY *dict_cidr_parse_rule(char *p, int lineno, int nesting,
        /*
         * Parse the pattern, destroying it in the process.
         */
-       if (cidr_match_parse(&cidr_info, pattern, why) != 0)
+       if (cidr_match_parse(&cidr_info, pattern, match, why) != 0)
            return (0);
 
        if (*value == 0) {

diff --git a/postfix/src/util/dict_cidr.map b/postfix/src/util/dict_cidr.map
index b3b94f9b5328884b84a904215181403364ef9baa..ac0f9b5fee155d41910b6ac124d54cedec5e33b8 100644 (file)
--- a/postfix/src/util/dict_cidr.map
+++ b/postfix/src/util/dict_cidr.map
@@ -36,12 +36,12 @@ endif
 2001:240:5c7:0:2d0:b7ff:fe88:2ca7 match 2001:240:5c7:0:2d0:b7ff:fe88:2ca7
 2001:240:5c7::/64      match netblock 2001:240:5c7::/64
 1.0.0.0/0              match 0.0.0.0/0
-0.0.0.0/0              match 0.0.0.0/0
+! ! 0.0.0.0/0          match 0.0.0.0/0
 1::/0                  match ::/0
 ::/0                   match ::/0
-[1234                  foo
-[1234]junk             bar
-172.16.1.3/3x          whatever
+[1234                  can't happen
+[1234]junk             can't happen
+172.16.1.3/3x          can't happen
 endif
 endif
 if 1:2::3:4

diff --git a/postfix/src/util/dict_cidr.ref b/postfix/src/util/dict_cidr.ref
index ceb2c99cf4d75047e78c7f3b834db0181178b36d..a83de6b0c5e4301c30def15745124170975ebbef 100644 (file)
--- a/postfix/src/util/dict_cidr.ref
+++ b/postfix/src/util/dict_cidr.ref
@@ -10,8 +10,8 @@
 ./dict_open: warning: cidr map dict_cidr.map, line 44: bad net/mask pattern: "172.16.1.3/3x": skipping this rule
 ./dict_open: warning: cidr map dict_cidr.map, line 45: ENDIF without IF: skipping this rule
 ./dict_open: warning: cidr map dict_cidr.map, line 46: ENDIF without IF: skipping this rule
-./dict_open: warning: cidr map dict_cidr.map, line 49: no pattern: skipping this rule
-./dict_open: warning: cidr map dict_cidr.map, line 50: no pattern: skipping this rule
+./dict_open: warning: cidr map dict_cidr.map, line 49: no address pattern: skipping this rule
+./dict_open: warning: cidr map dict_cidr.map, line 50: no address pattern: skipping this rule
 ./dict_open: warning: cidr map dict_cidr.map, line 48: IF has no matching ENDIF
 ./dict_open: warning: cidr map dict_cidr.map, line 47: IF has no matching ENDIF
 owner=untrusted (uid=USER)

diff --git a/postfix/src/util/dict_pcre.c b/postfix/src/util/dict_pcre.c
index 8f3032638b659e66d6b5c922261e19745df639da..ac06f5841a75db6efe4e6ddbd555eed8fbdcb4e2 100644 (file)
--- a/postfix/src/util/dict_pcre.c
+++ b/postfix/src/util/dict_pcre.c
@@ -429,16 +429,13 @@ static int dict_pcre_get_pattern(const char *mapname, int lineno, char **bufp,
      * Process negation operators.
      */
     pattern->match = 1;
-    while (*p == '!') {
-       pattern->match = !pattern->match;
+    for (;;) {
+       if (*p == '!')
+           pattern->match = !pattern->match;
+       else if (!ISSPACE(*p))
+           break;
        p++;
     }
-
-    /*
-     * Grr...aceful handling of whitespace after '!'.
-     */
-    while (*p && ISSPACE(*p))
-       p++;
     if (*p == 0) {
        msg_warn("pcre map %s, line %d: no regexp: skipping this rule",
                 mapname, lineno);

diff --git a/postfix/src/util/dict_regexp.c b/postfix/src/util/dict_regexp.c
index 1e5c449d37b1e1ff6ae1e1d6485c8d965af99a55..cd422379349be33e59c6250ae5470f039db00ec7 100644 (file)
--- a/postfix/src/util/dict_regexp.c
+++ b/postfix/src/util/dict_regexp.c
@@ -380,16 +380,13 @@ static int dict_regexp_get_pat(const char *mapname, int lineno, char **bufp,
      * Process negation operators.
      */
     pat->match = 1;
-    while (*p == '!') {
-       pat->match = !pat->match;
+    for (;;) {
+       if (*p == '!')
+           pat->match = !pat->match;
+       else if (!ISSPACE(*p))
+           break;
        p++;
     }
-
-    /*
-     * Grr...aceful handling of whitespace after '!'.
-     */
-    while (*p && ISSPACE(*p))
-       p++;
     if (*p == 0) {
        msg_warn("regexp map %s, line %d: no regexp: skipping this rule",
                 mapname, lineno);

diff --git a/postfix/src/util/match_ops.c b/postfix/src/util/match_ops.c
index 35b553ee755658cd68bb3adde1e15384eae26b34..de73198120e0037da0aaaecfcafcb8a0158f4fe3 100644 (file)
--- a/postfix/src/util/match_ops.c
+++ b/postfix/src/util/match_ops.c
@@ -294,7 +294,8 @@ int     match_hostaddr(MATCH_LIST *list, const char *addr, const char *pattern)
      * everything into to binary form, and to do the comparison there.
      */
     saved_patt = mystrdup(pattern);
-    err = cidr_match_parse(&match_info, saved_patt, (VSTRING *) 0);
+    err = cidr_match_parse(&match_info, saved_patt, CIDR_MATCH_TRUE,
+                          (VSTRING *) 0);
     myfree(saved_patt);
     if (err != 0) {
        list->error = DICT_ERR_RETRY;