postfix-2.6-20081007

diff --git a/postfix/HISTORY b/postfix/HISTORY
index f78a25e968cd7a140e427be4bb9865ff47beee2e..14f850734d5cfaebf82ac93a037e09c8b5b90c17 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -14695,3 +14695,9 @@ Apologies for any names omitted.
 
        Hardened the proxymap client, in case it ever ends up in
        a set-gid program. File: global/dict_proxy.c.
+
+10081007
+
+       Undo the proxymap client change. It broke chrooted servers
+       when they attempted to reconnect to the proxy read/write
+       service. File: global/dict_proxy.c.

diff --git a/postfix/src/global/dict_proxy.c b/postfix/src/global/dict_proxy.c
index 5d0a11a611614e512d035abdb3bb9f18400f427c..78a5dd73e520a08abc9d9525e7486afd372c33e4 100644 (file)
--- a/postfix/src/global/dict_proxy.c
+++ b/postfix/src/global/dict_proxy.c
@@ -308,7 +308,7 @@ DICT   *dict_proxy_open(const char *map, int open_flags, int dict_flags)
     int     server_flags;
     int     status;
     const char *service;
-    char   *chroot_path;
+    char   *relative_path;
     char   *kludge = 0;
     char   *prefix;
     CLNT_STREAM **pstream;
@@ -342,10 +342,10 @@ DICT   *dict_proxy_open(const char *map, int open_flags, int dict_flags)
                  map, DICT_TYPE_PROXY);
 
     if (*pstream == 0) {
-       chroot_path = concatenate("/" MAIL_CLASS_PRIVATE "/",
+       relative_path = concatenate(MAIL_CLASS_PRIVATE "/",
                                    service, (char *) 0);
-       if (access(chroot_path, F_OK) == 0)
-           prefix = "/" MAIL_CLASS_PRIVATE;
+       if (access(relative_path, F_OK) == 0)
+           prefix = MAIL_CLASS_PRIVATE;
        else
            prefix = kludge = concatenate(var_queue_dir, "/",
                                          MAIL_CLASS_PRIVATE, (char *) 0);
@@ -353,7 +353,7 @@ DICT   *dict_proxy_open(const char *map, int open_flags, int dict_flags)
                                      var_ipc_ttl_limit);
        if (kludge)
            myfree(kludge);
-       myfree(chroot_path);
+       myfree(relative_path);
     }
 
     /*

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2c22d40fdd8c76e59d0e4b03c257bd874f40830a..09700c2ee6f06d6eb0226428ba1a1e5eb7967cb9 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      "20081006"
+#define MAIL_RELEASE_DATE      "20081007"
 #define MAIL_VERSION_NUMBER    "2.6"
 
 #ifdef SNAPSHOT