postfix-2.3-20050708

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 76b932dfdc47329bd7e009ac4ef3d8fdac8e0e82..3f7eb98515df33c352c1639c81a1514425f3f6bf 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -10978,6 +10978,11 @@ Apologies for any names omitted.
        closing the socket that it just sent. Files: scache/scache.c,
        global/scache_clnt.c.
         
+20050708
+
+       Bugfix: missing returns in 20050706 caching disabling code.
+       File: global/scache_clnt.c.
+
 Open problems:
 
        Look for systems with XPG basename() declared in <libgen.h>,

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 0476ecb43a7c343f5cf36279eae40ba2b9356a0d..87fbef89df70710aff82efd80fbbdf59a533345f 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      "20050707"
+#define MAIL_RELEASE_DATE      "20050708"
 #define MAIL_VERSION_NUMBER    "2.3"
 
 #define VAR_MAIL_VERSION       "mail_version"

diff --git a/postfix/src/global/scache_clnt.c b/postfix/src/global/scache_clnt.c
index 4749d6931006b85fe2d5231ffc14dc0211d6e4fa..f8098eea3c73d0b03f429d88e31544b5592c8dbe 100644 (file)
--- a/postfix/src/global/scache_clnt.c
+++ b/postfix/src/global/scache_clnt.c
@@ -220,6 +220,7 @@ static int scache_clnt_find_endp(SCACHE *scache, const char *endp_label,
        sleep(1);                               /* XXX make configurable */
        clnt_stream_recover(sp->clnt_stream);
     }
+    return (-1);
 }
 
 /* scache_clnt_save_dest - create destination/endpoint association */
@@ -361,6 +362,7 @@ static int scache_clnt_find_dest(SCACHE *scache, const char *dest_label,
        sleep(1);                               /* XXX make configurable */
        clnt_stream_recover(sp->clnt_stream);
     }
+    return (-1);
 }
 
 /* scache_clnt_size - dummy */