postfix-1.1.11-20020924

diff --git a/postfix/HISTORY b/postfix/HISTORY
index d0327940d4c87a12735d55be5ea505d1b89b402b..534ec272deb0fc5f45f37e8c699633345a65dfe4 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -7018,6 +7018,12 @@ Apologies for any names omitted.
        The reject_rbl restriction name is still recognized for
        compatibility with systems maintained by LaMont Jones.
 
+20020924
+
+       Bugfix: reject_rhsbl_<mumble> was broken when <mumble> was
+       unavailable, causing the restrictions parser to get out if
+       sync. Spotted by Ralf Hildebrandt.  File:  smtpd/smtpd_check.c.
+
 Open problems:
 
        Low: smtpd should log queue ID with reject/warn/hold/discard

diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES
index 96b0afbcb72e03ff98f1f4c45c1e427e31f89870..d48b20094bf551ce72a3c8a048839699a5b87dc3 100644 (file)
--- a/postfix/RELEASE_NOTES
+++ b/postfix/RELEASE_NOTES
@@ -15,7 +15,7 @@ the same bugfixes as a patch release.
 Incompatible changes with Postfix snapshot 1.1.11-20020923
 ==========================================================
 
-Subtle change in ${name:result} macro expansions:  the expansion
+Subtle change in ${name?result} macro expansions:  the expansion
 no longer happens when $name is an empty string. This probably
 makes more sense than the old behavior.
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 11f19ff1a4f1b12d5268a69087cf12af4eadb2cd..6319c6598c0ff69f85c3a28c9a6a7668cd0092df 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change the patchlevel and the release date. Snapshots change the
   * release date only, unless they include the same bugfix as a patch release.
   */
-#define MAIL_RELEASE_DATE      "20020923"
+#define MAIL_RELEASE_DATE      "20020924"
 
 #define VAR_MAIL_VERSION       "mail_version"
 #define DEF_MAIL_VERSION       "1.1.11-" MAIL_RELEASE_DATE

diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index cc4ad2d130f9a514a92098f5575a3e0662780951..6e78d30fd1868daee4c44adb99c2a9e5ecef55d1 100644 (file)
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -110,8 +110,8 @@
 /* .IP reject_maps_rbl
 /*     Look up the reversed client network address in the real-time blackhole
 /*     DNS zones below the domains listed in the "maps_rbl_domains"
-/*     configuration parameter.  This is equivalent to using "reject_rbl"
-/*     once for each such domain.
+/*     configuration parameter.  This is equivalent to using
+/*     "reject_rbl_client" once for each such domain.
 /* .IP permit_naked_ip_address
 /*     Permit the use of a naked IP address (without enclosing [])
 /*     in HELO/EHLO commands.
@@ -2632,9 +2632,12 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
            if (*(cpp[1]) == 0)
                msg_warn("restriction %s requires domain name argument",
                         name);
-           else if (strcasecmp(state->name, "unknown") != 0)
-               status = reject_rbl_domain(state, *(cpp += 1), state->name,
-                                          SMTPD_NAME_CLIENT);
+           else {
+               cpp += 1;
+               if (strcasecmp(state->name, "unknown") != 0)
+                   status = reject_rbl_domain(state, *cpp, state->name,
+                                              SMTPD_NAME_CLIENT);
+           }
        }
 
        /*
@@ -2713,9 +2716,12 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
        } else if (strcasecmp(name, REJECT_RHSBL_SENDER) == 0) {
            if (cpp[1] == 0)
                msg_warn("restriction %s requires domain name argument", name);
-           else if (state->sender && *state->sender)
-               status = reject_rbl_domain(state, *(cpp += 1), state->sender,
-                                          SMTPD_NAME_SENDER);
+           else {
+               cpp += 1;
+               if (state->sender && *state->sender)
+                   status = reject_rbl_domain(state, *cpp, state->sender,
+                                              SMTPD_NAME_SENDER);
+           }
        }
 
        /*
@@ -2762,9 +2768,12 @@ static int generic_checks(SMTPD_STATE *state, ARGV *restrictions,
        } else if (strcasecmp(name, REJECT_RHSBL_RECIPIENT) == 0) {
            if (cpp[1] == 0)
                msg_warn("restriction %s requires domain name argument", name);
-           else if (state->recipient)
-               status = reject_rbl_domain(state, *(cpp += 1), state->recipient,
-                                          SMTPD_NAME_RECIPIENT);
+           else {
+               cpp += 1;
+               if (state->recipient)
+                   status = reject_rbl_domain(state, *cpp, state->recipient,
+                                              SMTPD_NAME_RECIPIENT);
+           }
        }
 
        /*