2
0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-31 06:05:37 +00:00

postfix-2.6-20081007

This commit is contained in:
Wietse Venema
2008-10-07 00:00:00 -05:00
committed by Viktor Dukhovni
parent 9a5e8ef812
commit 40373c1f28
3 changed files with 12 additions and 6 deletions

View File

@@ -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.

View File

@@ -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);
}
/*

View File

@@ -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