From: Wietse Venema <wietse@porcupine.org>
Date: Thu, 21 Feb 2008 05:00:00 +0000 (-0500)
Subject: postfix-2.6-20080221
X-Git-Tag: v2.6.0-RC1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296db4d9080988fb9448e8002863a5e55b054066;p=thirdparty%2Fpostfix.git

postfix-2.6-20080221
---

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 62cb2496a..b2977c82f 100644
--- 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	"20080220"
+#define MAIL_RELEASE_DATE	"20080221"
 #define MAIL_VERSION_NUMBER	"2.6"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/master/Makefile.in b/postfix/src/master/Makefile.in
index 6ab775d47..9748b2257 100644
--- a/postfix/src/master/Makefile.in
+++ b/postfix/src/master/Makefile.in
@@ -106,6 +106,7 @@ master.o: ../../include/mymalloc.h
 master.o: ../../include/open_lock.h
 master.o: ../../include/safe.h
 master.o: ../../include/set_eugid.h
+master.o: ../../include/set_ugid.h
 master.o: ../../include/stringops.h
 master.o: ../../include/sys_defs.h
 master.o: ../../include/vbuf.h
diff --git a/postfix/src/master/master.c b/postfix/src/master/master.c
index 4452fbdd6..e6d212ef6 100644
--- a/postfix/src/master/master.c
+++ b/postfix/src/master/master.c
@@ -186,6 +186,7 @@
 #include <argv.h>
 #include <safe.h>
 #include <set_eugid.h>
+#include <set_ugid.h>
 
 /* Global library. */
 
@@ -423,10 +424,10 @@ int     main(int argc, char **argv)
      * Lock down the Postfix-writable data directory.
      */
     vstring_sprintf(data_lock_path, "%s/%s.lock", var_data_dir, var_procname);
-    SAVE_AND_SET_EUGID(var_owner_uid, var_owner_gid);
+    set_eugid(var_owner_uid, var_owner_gid);
     data_lock_fp =
 	open_lock(vstring_str(data_lock_path), O_RDWR | O_CREAT, 0644, why);
-    RESTORE_SAVED_EUGID();
+    set_ugid(getuid(), getgid());
     if (data_lock_fp == 0)
 	msg_fatal("open lock file %s: %s",
 		  vstring_str(data_lock_path), vstring_str(why));