postfix-2.0.18

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 7597d702daedbb1acaebd7842f31ea845cf879f6..c3b4f0d45885caa8ce538a03acf4bf6e0e20d706 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -7956,6 +7956,15 @@ Apologies for any names omitted.
        not report really serious trouble with the destination.
        Files:  *qmgr/qmgr_deliver.c.
 
+20040122
+
+       UNDO the 20040104 change (vstring_get() etc. return
+       VSTREAM_EOF when they terminate prematurely, instead of
+       returning the last character stored, to avoid mis-leading
+       warnings). File:  global/vstring_vstream.c.
+
+       Portability: test -e is not portable. File: conf/postfix-script.
+
 Open problems:
 
        Doc: mention the proxy_interfaces parameter everywhere the

diff --git a/postfix/conf/postfix-script b/postfix/conf/postfix-script
index 72cd2c08b01564b4af36af2d9c04ee5e90a3c17c..43ef24b1620b7ce8464051d9a4a873f5419a000d 100644 (file)
--- a/postfix/conf/postfix-script
+++ b/postfix/conf/postfix-script
@@ -200,7 +200,7 @@ check)
        do
                test -d $dir && find $dir -type f -print | while read path
                do
-                       test -e /$path && {
+                       test -f /$path && {
                            cmp -s $path /$path || 
                                $WARN $queue_directory/$path and /$path differ
                        }

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 34da12f75ea6f967ba00f28a493a31f2460b4cd6..35fd457689e4561e6ecf42a09abe65b9d76f20fd 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,10 +20,10 @@
   * 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      "20040119"
+#define MAIL_RELEASE_DATE      "20040122"
 
 #define VAR_MAIL_VERSION       "mail_version"
-#define DEF_MAIL_VERSION       "2.0.17"
+#define DEF_MAIL_VERSION       "2.0.18"
 extern char *var_mail_version;
 
  /*

diff --git a/postfix/src/util/vstring_vstream.c b/postfix/src/util/vstring_vstream.c
index 20ec1a1316defb87cc5fd608941ea365c90f8525..2f644bf1dc7f994310a49c280dac302ffe942031 100644 (file)
--- a/postfix/src/util/vstring_vstream.c
+++ b/postfix/src/util/vstring_vstream.c
@@ -95,7 +95,7 @@ int     vstring_get(VSTRING *vp, VSTREAM *fp)
            break;
     }
     VSTRING_TERMINATE(vp);
-    return (c == VSTREAM_EOF ? c : VSTRING_GET_RESULT(vp));
+    return (VSTRING_GET_RESULT(vp));
 }
 
 /* vstring_get_nonl - read line from file, strip newline */
@@ -108,7 +108,7 @@ int     vstring_get_nonl(VSTRING *vp, VSTREAM *fp)
     while ((c = VSTREAM_GETC(fp)) != VSTREAM_EOF && c != '\n')
        VSTRING_ADDCH(vp, c);
     VSTRING_TERMINATE(vp);
-    return (c == '\n' || c == VSTREAM_EOF ? c : VSTRING_GET_RESULT(vp));
+    return (c == '\n' ? c : VSTRING_GET_RESULT(vp));
 }
 
 /* vstring_get_null - read null-terminated string from file */
@@ -121,7 +121,7 @@ int     vstring_get_null(VSTRING *vp, VSTREAM *fp)
     while ((c = VSTREAM_GETC(fp)) != VSTREAM_EOF && c != 0)
        VSTRING_ADDCH(vp, c);
     VSTRING_TERMINATE(vp);
-    return (c == 0 || c == VSTREAM_EOF ? c : VSTRING_GET_RESULT(vp));
+    return (c == 0 ? c : VSTRING_GET_RESULT(vp));
 }
 
 /* vstring_get_bound - read line from file, keep newline, up to bound */
@@ -140,7 +140,7 @@ int     vstring_get_bound(VSTRING *vp, VSTREAM *fp, int bound)
            break;
     }
     VSTRING_TERMINATE(vp);
-    return (c == VSTREAM_EOF ? c : VSTRING_GET_RESULT(vp));
+    return (VSTRING_GET_RESULT(vp));
 }
 
 /* vstring_get_nonl_bound - read line from file, strip newline, up to bound */
@@ -156,7 +156,7 @@ int     vstring_get_nonl_bound(VSTRING *vp, VSTREAM *fp, int bound)
     while (bound-- > 0 && (c = VSTREAM_GETC(fp)) != VSTREAM_EOF && c != '\n')
        VSTRING_ADDCH(vp, c);
     VSTRING_TERMINATE(vp);
-    return (c == '\n' || c == VSTREAM_EOF ? c : VSTRING_GET_RESULT(vp));
+    return (c == '\n' ? c : VSTRING_GET_RESULT(vp));
 }
 
 /* vstring_get_null_bound - read null-terminated string from file */
@@ -172,7 +172,7 @@ int     vstring_get_null_bound(VSTRING *vp, VSTREAM *fp, int bound)
     while (bound-- > 0 && (c = VSTREAM_GETC(fp)) != VSTREAM_EOF && c != 0)
        VSTRING_ADDCH(vp, c);
     VSTRING_TERMINATE(vp);
-    return (c == 0 || c == VSTREAM_EOF ? c : VSTRING_GET_RESULT(vp));
+    return (c == 0 ? c : VSTRING_GET_RESULT(vp));
 }
 
 #ifdef TEST