snapshot-19990406

diff --git a/postfix/.printfck b/postfix/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/.printfck
+++ b/postfix/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 5515cf17439994a830ccd87f1676bf08502aa19f..37978e9afe857a85d482d9df6892f019e72441cf 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -2534,6 +2534,11 @@ Apologies for any names omitted.
        conditional expressions such as ${name?text} where `text'
        contains other ${name} expressions.
 
+19990406
+
+       Cleanup: changed MIME header information to make bounces
+       RFC 1892 compliant.
+
 Future:
 
        Planned: must be able to list the same hash table in

diff --git a/postfix/bounce/.printfck b/postfix/bounce/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/bounce/.printfck
+++ b/postfix/bounce/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/bounce/bounce_notify_service.c b/postfix/bounce/bounce_notify_service.c
index a7f5d25673fef44ca12b3cdd4c7fc520ef6a3ec7..9746a9e3398d10d6d73c470d3de425a2df781373 100644 (file)
--- a/postfix/bounce/bounce_notify_service.c
+++ b/postfix/bounce/bounce_notify_service.c
@@ -119,7 +119,8 @@ static int bounce_header(VSTREAM *bounce, VSTRING *buf, const char *dest,
      * MIME header.
      */
     post_mail_fprintf(bounce, "MIME-Version: 1.0");
-    post_mail_fprintf(bounce, "Content-Type: %s/%s;", "multipart", "mixed");
+    post_mail_fprintf(bounce, "Content-Type: %s; report-type=%s;",
+                     "multipart/report", "x-postfix-report");
     post_mail_fprintf(bounce, "\tboundary=\"%s\"", boundary);
     post_mail_fputs(bounce, "");
     post_mail_fputs(bounce, "This is a MIME-encapsulated message.");
@@ -138,7 +139,7 @@ static int bounce_boilerplate(VSTREAM *bounce, VSTRING *buf,
      */
     post_mail_fprintf(bounce, "--%s", boundary);
     post_mail_fprintf(bounce, "Content-Description: %s", "Notification");
-    post_mail_fprintf(bounce, "Content-Type: %s/%s", "text", "plain");
+    post_mail_fprintf(bounce, "Content-Type: %s", "text/plain");
     post_mail_fputs(bounce, "");
 
     /*
@@ -210,7 +211,7 @@ static int bounce_diagnostics(char *service, VSTREAM *bounce, VSTRING *buf,
      */
     post_mail_fprintf(bounce, "--%s", boundary);
     post_mail_fprintf(bounce, "Content-Description: %s", "Delivery error report");
-    post_mail_fprintf(bounce, "Content-Type: %s/%s", "text", "plain");
+    post_mail_fprintf(bounce, "Content-Type: %s", "text/x-postfix-report");
     post_mail_fputs(bounce, "");
 
     /*
@@ -267,7 +268,8 @@ static int bounce_original(char *service, VSTREAM *bounce, VSTRING *buf,
      */
     post_mail_fprintf(bounce, "--%s", boundary);
     post_mail_fprintf(bounce, "Content-Description: %s", "Undelivered Message");
-    post_mail_fprintf(bounce, "Content-Type: %s/%s", "message", "rfc822");
+    post_mail_fprintf(bounce, "Content-Type: %s", headers_only ?
+                     "text/rfc822-headers" : "message/rfc822");
     post_mail_fputs(bounce, "");
 
     /*

diff --git a/postfix/cleanup/.printfck b/postfix/cleanup/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/cleanup/.printfck
+++ b/postfix/cleanup/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/conf/postfix-script-diff b/postfix/conf/postfix-script-diff
new file mode 100644 (file)
index 0000000..538659f
--- /dev/null
+++ b/postfix/conf/postfix-script-diff
@@ -0,0 +1,22 @@
+*** postfix-script-nosgid      Wed Mar 24 11:20:49 1999
+--- postfix-script-sgid        Wed Mar 24 11:20:53 1999
+***************
+*** 174,181 ****
+       test -d maildrop || {
+               $WARN creating missing Postfix maildrop directory
+               mkdir maildrop || exit 1
+!              chmod 1733 maildrop
+               chown $mail_owner maildrop
+       }
+       test -d pid || {
+               $WARN creating missing Postfix pid directory
+--- 174,182 ----
+       test -d maildrop || {
+               $WARN creating missing Postfix maildrop directory
+               mkdir maildrop || exit 1
+!              chmod 1730 maildrop
+               chown $mail_owner maildrop
++              chgrp maildrop maildrop
+       }
+       test -d pid || {
+               $WARN creating missing Postfix pid directory

diff --git a/postfix/conf/postfix-script-nosgid b/postfix/conf/postfix-script-nosgid
index 41a59bb889d594957bdda4be6b91c747da88a25b..c0786dff7ee978e5acf79b6d02a71384bc5ba5d5 100755 (executable)
--- a/postfix/conf/postfix-script-nosgid
+++ b/postfix/conf/postfix-script-nosgid
@@ -157,7 +157,7 @@ check)
 
        for dir in $daemon_directory $config_directory $queue_directory
        do
-               ls -lLd $dir | (grep root >/dev/null ||
+               ls -lLd $dir | (grep " root " >/dev/null ||
                    $WARN not owned by root: $dir)
        done
 
@@ -208,6 +208,12 @@ check)
            ! \( -type p -o -type s \) ! -user $mail_owner \
                -exec $WARN not owned by $mail_owner: {} \;
 
+       for dir in $queue_directory/maildrop
+       do
+               ls -lLd $dir | (grep " $mail_owner " >/dev/null ||
+                   $WARN not owned by $mail_owner: $dir)
+       done
+
        $command_directory/postsuper || exit 1
 
        find corrupt -type f -exec $WARN damaged message: {} \;

diff --git a/postfix/conf/postfix-script-sgid b/postfix/conf/postfix-script-sgid
index 56fdb263bd7dbabe87f0a9eb1d56d1a2d43f1682..68327e61036208c5e3fd8c83387aaa35c99d94e8 100755 (executable)
--- a/postfix/conf/postfix-script-sgid
+++ b/postfix/conf/postfix-script-sgid
@@ -157,7 +157,7 @@ check)
 
        for dir in $daemon_directory $config_directory $queue_directory
        do
-               ls -lLd $dir | (grep root >/dev/null ||
+               ls -lLd $dir | (grep " root " >/dev/null ||
                    $WARN not owned by root: $dir)
        done
 
@@ -209,6 +209,12 @@ check)
            ! \( -type p -o -type s \) ! -user $mail_owner \
                -exec $WARN not owned by $mail_owner: {} \;
 
+       for dir in $queue_directory/maildrop
+       do
+               ls -lLd $dir | (grep " $mail_owner " >/dev/null ||
+                   $WARN not owned by $mail_owner: $dir)
+       done
+
        $command_directory/postsuper || exit 1
 
        find corrupt -type f -exec $WARN damaged message: {} \;

diff --git a/postfix/dns/.printfck b/postfix/dns/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/dns/.printfck
+++ b/postfix/dns/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/fsstone/.printfck b/postfix/fsstone/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/fsstone/.printfck
+++ b/postfix/fsstone/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/global/.printfck b/postfix/global/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/global/.printfck
+++ b/postfix/global/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/global/mail_version.h b/postfix/global/mail_version.h
index 851ec4eb31bbf60d09de70a4560cb54d0e89a015..f437158f88e05860b84b081f3f76b7b471775fe1 100644 (file)
--- a/postfix/global/mail_version.h
+++ b/postfix/global/mail_version.h
@@ -15,7 +15,7 @@
   * Version of this program.
   */
 #define VAR_MAIL_VERSION       "mail_version"
-#define DEF_MAIL_VERSION       "Snapshot-19990405"
+#define DEF_MAIL_VERSION       "Snapshot-19990406"
 extern char *var_mail_version;
 
 /* LICENSE

diff --git a/postfix/local/.printfck b/postfix/local/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/local/.printfck
+++ b/postfix/local/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/master/.printfck b/postfix/master/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/master/.printfck
+++ b/postfix/master/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/pickup/.printfck b/postfix/pickup/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/pickup/.printfck
+++ b/postfix/pickup/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/pipe/.printfck b/postfix/pipe/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/pipe/.printfck
+++ b/postfix/pipe/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postalias/.printfck b/postfix/postalias/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postalias/.printfck
+++ b/postfix/postalias/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postcat/.printfck b/postfix/postcat/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postcat/.printfck
+++ b/postfix/postcat/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postconf/.printfck b/postfix/postconf/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postconf/.printfck
+++ b/postfix/postconf/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postdrop/.printfck b/postfix/postdrop/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postdrop/.printfck
+++ b/postfix/postdrop/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postfix/.printfck b/postfix/postfix/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postfix/.printfck
+++ b/postfix/postfix/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postkick/.printfck b/postfix/postkick/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postkick/.printfck
+++ b/postfix/postkick/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postlock/.printfck b/postfix/postlock/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postlock/.printfck
+++ b/postfix/postlock/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postlog/.printfck b/postfix/postlog/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postlog/.printfck
+++ b/postfix/postlog/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postmap/.printfck b/postfix/postmap/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postmap/.printfck
+++ b/postfix/postmap/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/postsuper/.printfck b/postfix/postsuper/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/postsuper/.printfck
+++ b/postfix/postsuper/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/qmgr/.printfck b/postfix/qmgr/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/qmgr/.printfck
+++ b/postfix/qmgr/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/sendmail/.printfck b/postfix/sendmail/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/sendmail/.printfck
+++ b/postfix/sendmail/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/showq/.printfck b/postfix/showq/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/showq/.printfck
+++ b/postfix/showq/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/smtp/.printfck b/postfix/smtp/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/smtp/.printfck
+++ b/postfix/smtp/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/smtpd/.printfck b/postfix/smtpd/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/smtpd/.printfck
+++ b/postfix/smtpd/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/smtpstone/.printfck b/postfix/smtpstone/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/smtpstone/.printfck
+++ b/postfix/smtpstone/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/trivial-rewrite/.printfck b/postfix/trivial-rewrite/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/trivial-rewrite/.printfck
+++ b/postfix/trivial-rewrite/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0

diff --git a/postfix/util/.printfck b/postfix/util/.printfck
index 9ed900cb0932465d332f71f2457f9dcb6ae8c6cf..65eb6bfa6d91782435eff5057d94e7ce5f79be0f 100644 (file)
--- a/postfix/util/.printfck
+++ b/postfix/util/.printfck
@@ -10,6 +10,7 @@ msg_info      0       0
 msg_panic      0       0
 msg_warn       0       0
 opened 3       0
+post_mail_fprintf      1       0
 qmgr_message_bounce    2       0
 rec_fprintf    2       0
 sent   4       0