From: Wietse Venema <wietse@porcupine.org>
Date: Thu, 22 Jan 2004 05:00:00 +0000 (-0500)
Subject: postfix-2.0.18
X-Git-Tag: v2.0.18^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc7d233c18403dd0e02ef5864f09d5adf2deed1;p=thirdparty%2Fpostfix.git

postfix-2.0.18
---

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 7597d702d..c3b4f0d45 100644
--- 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 72cd2c08b..43ef24b16 100644
--- 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 34da12f75..35fd45768 100644
--- 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 20ec1a131..2f644bf1d 100644
--- 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