postfix-2.6-20080221

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 62cb2496a93b94fb76f23cdd4241d3b484217b0d..b2977c82fc53ff5506326fd4197f98415aa24c41 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      "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 6ab775d478f5f087fa48cf1b7932cd2065d84b52..9748b22571c0db75df0f59ca251a71f887712344 100644 (file)
--- 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 4452fbdd620c4d6ada5b0e5c5560684621c1ed88..e6d212ef6fc106ebed99afd2dc782d306cc82f16 100644 (file)
--- 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));