Maildir delivery for Sendmail

diff --git a/mailboxes/mailboxes-lib.pl b/mailboxes/mailboxes-lib.pl
index a4fd94c..abd9d92 100644 (file)
--- a/mailboxes/mailboxes-lib.pl
+++ b/mailboxes/mailboxes-lib.pl
@@ -198,10 +198,19 @@ if (!defined(@mail_style_cache)) {
                        # Can get paths from Sendmail module config
                        local %sconfig = &foreign_config("sendmail");
                        if ($sconfig{'mail_dir'}) {
-                               return ($sconfig{'mail_dir'}, $sconfig{'mail_style'}, undef, undef);
+                               # File under /var/mail
+                               return ($sconfig{'mail_dir'},
+                                       $sconfig{'mail_style'}, undef, undef);
+                               }
+                       elsif ($sconfig{'mail_type'}) {
+                               # Maildir under home directory
+                               return (undef, $sconfig{'mail_style'},
+                                       undef, $sconfig{'mail_file'});
                                }
                        else {
-                               return (undef, $sconfig{'mail_style'}, $sconfig{'mail_file'}, undef);
+                               # mbox under home directory
+                               return (undef, $sconfig{'mail_style'},
+                                       $sconfig{'mail_file'}, undef);
                                }
                        }
                elsif ($config{'mail_system'} == 0) {

diff --git a/sendmail/CHANGELOG b/sendmail/CHANGELOG
index a138305..9024d8b 100644 (file)
--- a/sendmail/CHANGELOG
+++ b/sendmail/CHANGELOG
@@ -29,3 +29,5 @@ Cleaned up the code and UIs for all mapping lists, to fit in better with the Web
 ---- Changes since 1.300 ----
 The count of messages in the mail queue on the module's main page no longer includes those that the current user does not have access to.
 Added access control for the Spam Control page.
+---- Changes since 1.390 ----
+Added a Module Config option to support ~/Maildir mailboxes (even though Sendmail doesn't support this natively).

diff --git a/sendmail/config-aix b/sendmail/config-aix
index b926996..0fe2373 100644 (file)
--- a/sendmail/config-aix
+++ b/sendmail/config-aix
@@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-cobalt-linux b/sendmail/config-cobalt-linux
index 8ec116b..c35307b 100644 (file)
--- a/sendmail/config-cobalt-linux
+++ b/sendmail/config-cobalt-linux
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-coherent-linux b/sendmail/config-coherent-linux
index 45c58f1..0537479 100644 (file)
--- a/sendmail/config-coherent-linux
+++ b/sendmail/config-coherent-linux
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-corel-linux b/sendmail/config-corel-linux
index 1d2145a..e205ec5 100644 (file)
--- a/sendmail/config-corel-linux
+++ b/sendmail/config-corel-linux
@@ -26,3 +26,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-debian-linux b/sendmail/config-debian-linux
index 410c40e..1256a00 100644 (file)
--- a/sendmail/config-debian-linux
+++ b/sendmail/config-debian-linux
@@ -28,3 +28,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-debian-linux-2.1-2.2 b/sendmail/config-debian-linux-2.1-2.2
index 252fd88..76bd28a 100644 (file)
--- a/sendmail/config-debian-linux-2.1-2.2
+++ b/sendmail/config-debian-linux-2.1-2.2
@@ -28,3 +28,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-debian-linux-3.0-* b/sendmail/config-debian-linux-3.0-*
index 7f20f66..e27025c 100644 (file)
--- a/sendmail/config-debian-linux-3.0-*
+++ b/sendmail/config-debian-linux-3.0-*
@@ -28,3 +28,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-freebsd b/sendmail/config-freebsd
index bd39eb2..96409e1 100644 (file)
--- a/sendmail/config-freebsd
+++ b/sendmail/config-freebsd
@@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-freebsd-4.0-* b/sendmail/config-freebsd-4.0-*
index 7a0dcef..5aada62 100644 (file)
--- a/sendmail/config-freebsd-4.0-*
+++ b/sendmail/config-freebsd-4.0-*
@@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-generic-linux b/sendmail/config-generic-linux
index 3da6fb1..59a4665 100755 (executable)
--- a/sendmail/config-generic-linux
+++ b/sendmail/config-generic-linux
@@ -36,3 +36,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-gentoo-linux b/sendmail/config-gentoo-linux
index ef9465b..4a07949 100755 (executable)
--- a/sendmail/config-gentoo-linux
+++ b/sendmail/config-gentoo-linux
@@ -36,3 +36,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-hpux b/sendmail/config-hpux
index 99df3a5..27a3904 100644 (file)
--- a/sendmail/config-hpux
+++ b/sendmail/config-hpux
@@ -26,3 +26,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-irix b/sendmail/config-irix
index 9f1f161..481013d 100644 (file)
--- a/sendmail/config-irix
+++ b/sendmail/config-irix
@@ -34,3 +34,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-macos b/sendmail/config-macos
index 0a300de..712b49b 100644 (file)
--- a/sendmail/config-macos
+++ b/sendmail/config-macos
@@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-macos-1.3-* b/sendmail/config-macos-1.3-*
index b96f297..6ff73ca 100644 (file)
--- a/sendmail/config-macos-1.3-*
+++ b/sendmail/config-macos-1.3-*
@@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-mandrake-linux b/sendmail/config-mandrake-linux
index 1f13cf6..c63ce83 100644 (file)
--- a/sendmail/config-mandrake-linux
+++ b/sendmail/config-mandrake-linux
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-mandrake-linux-8.2 b/sendmail/config-mandrake-linux-8.2
index 979320f..f51ff52 100644 (file)
--- a/sendmail/config-mandrake-linux-8.2
+++ b/sendmail/config-mandrake-linux-8.2
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-mandrake-linux-9.0-* b/sendmail/config-mandrake-linux-9.0-*
index ace097a..715ae44 100644 (file)
--- a/sendmail/config-mandrake-linux-9.0-*
+++ b/sendmail/config-mandrake-linux-9.0-*
@@ -30,3 +30,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-msc-linux b/sendmail/config-msc-linux
index 2ca14ad..2ba7a45 100644 (file)
--- a/sendmail/config-msc-linux
+++ b/sendmail/config-msc-linux
@@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-netbsd b/sendmail/config-netbsd
index a721364..102becf 100644 (file)
--- a/sendmail/config-netbsd
+++ b/sendmail/config-netbsd
@@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-open-linux b/sendmail/config-open-linux
index 2ae4cf0..2741769 100644 (file)
--- a/sendmail/config-open-linux
+++ b/sendmail/config-open-linux
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-open-linux-2.5 b/sendmail/config-open-linux-2.5
index 19af811..452b3e4 100644 (file)
--- a/sendmail/config-open-linux-2.5
+++ b/sendmail/config-open-linux-2.5
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-open-linux-3.1e b/sendmail/config-open-linux-3.1e
index 19af811..452b3e4 100644 (file)
--- a/sendmail/config-open-linux-3.1e
+++ b/sendmail/config-open-linux-3.1e
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-openbsd b/sendmail/config-openbsd
index c15a2d2..a06ff50 100644 (file)
--- a/sendmail/config-openbsd
+++ b/sendmail/config-openbsd
@@ -30,3 +30,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-openserver b/sendmail/config-openserver
index abb769c..28636ff 100644 (file)
--- a/sendmail/config-openserver
+++ b/sendmail/config-openserver
@@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-osf1 b/sendmail/config-osf1
index 33c7ee1..315fb28 100644 (file)
--- a/sendmail/config-osf1
+++ b/sendmail/config-osf1
@@ -26,3 +26,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-redhat-linux b/sendmail/config-redhat-linux
index 774f4e7..303538e 100644 (file)
--- a/sendmail/config-redhat-linux
+++ b/sendmail/config-redhat-linux
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-redhat-linux-10.0-* b/sendmail/config-redhat-linux-10.0-*
index d8e4a4b..0f21957 100644 (file)
--- a/sendmail/config-redhat-linux-10.0-*
+++ b/sendmail/config-redhat-linux-10.0-*
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-redhat-linux-7.1-7.3 b/sendmail/config-redhat-linux-7.1-7.3
index cb45aac..1a685f0 100644 (file)
--- a/sendmail/config-redhat-linux-7.1-7.3
+++ b/sendmail/config-redhat-linux-7.1-7.3
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-redhat-linux-7.4-9.0 b/sendmail/config-redhat-linux-7.4-9.0
index 45c58f1..0537479 100644 (file)
--- a/sendmail/config-redhat-linux-7.4-9.0
+++ b/sendmail/config-redhat-linux-7.4-9.0
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-slackware-linux b/sendmail/config-slackware-linux
index af21b93..0a6061d 100644 (file)
--- a/sendmail/config-slackware-linux
+++ b/sendmail/config-slackware-linux
@@ -26,3 +26,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-slackware-linux-8.0 b/sendmail/config-slackware-linux-8.0
index 3da6fb1..59a4665 100755 (executable)
--- a/sendmail/config-slackware-linux-8.0
+++ b/sendmail/config-slackware-linux-8.0
@@ -36,3 +36,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-slackware-linux-8.1-* b/sendmail/config-slackware-linux-8.1-*
index 29e423d..1fce53d 100755 (executable)
--- a/sendmail/config-slackware-linux-8.1-*
+++ b/sendmail/config-slackware-linux-8.1-*
@@ -36,3 +36,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-sol-linux b/sendmail/config-sol-linux
index b793d05..b99b00a 100644 (file)
--- a/sendmail/config-sol-linux
+++ b/sendmail/config-sol-linux
@@ -36,3 +36,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-solaris b/sendmail/config-solaris
index 3938857..1ac9bad 100644 (file)
--- a/sendmail/config-solaris
+++ b/sendmail/config-solaris
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-solaris-10-* b/sendmail/config-solaris-10-*
index 3959028..5d62fc6 100755 (executable)
--- a/sendmail/config-solaris-10-*
+++ b/sendmail/config-solaris-10-*
@@ -34,3 +34,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 sendmail_smf=network/smtp:sendmail
+mail_type=0

diff --git a/sendmail/config-solaris-7 b/sendmail/config-solaris-7
index 4cdb6a4..5d326c8 100644 (file)
--- a/sendmail/config-solaris-7
+++ b/sendmail/config-solaris-7
@@ -35,3 +35,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-solaris-8-9 b/sendmail/config-solaris-8-9
index c6ee485..3168fa6 100644 (file)
--- a/sendmail/config-solaris-8-9
+++ b/sendmail/config-solaris-8-9
@@ -35,3 +35,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-suse-linux b/sendmail/config-suse-linux
index 950d8bb..c5fb158 100644 (file)
--- a/sendmail/config-suse-linux
+++ b/sendmail/config-suse-linux
@@ -28,3 +28,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-suse-linux-8.2-* b/sendmail/config-suse-linux-8.2-*
index 8f40a79..21d01c1 100644 (file)
--- a/sendmail/config-suse-linux-8.2-*
+++ b/sendmail/config-suse-linux-8.2-*
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-turbo-linux b/sendmail/config-turbo-linux
index e3161f2..3aa6f51 100644 (file)
--- a/sendmail/config-turbo-linux
+++ b/sendmail/config-turbo-linux
@@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-united-linux b/sendmail/config-united-linux
index 950d8bb..c5fb158 100644 (file)
--- a/sendmail/config-united-linux
+++ b/sendmail/config-united-linux
@@ -28,3 +28,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config-unixware b/sendmail/config-unixware
index 459ef3b..8109588 100644 (file)
--- a/sendmail/config-unixware
+++ b/sendmail/config-unixware
@@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0
 
+mail_type=0

diff --git a/sendmail/config.info b/sendmail/config.info
index f9ae246..b6caf9b 100644 (file)
--- a/sendmail/config.info
+++ b/sendmail/config.info
@@ -31,6 +31,7 @@ access_file=Source file for the access database,3,Same as DBM
 domains_file=Source file for the domains database,3,Same as DBM
 mail_dir=User mail file location,3,File under home directory
 mail_file=Mail file in home directory,0
+mail_type=Mail storage type,1,1-Maildir,0-mbox
 mail_style=Mail file directory style,4,0-mail/username,1-mail/u/username,2-mail/u/us/username,3-mail/u/s/username
 mail_sync=User mail file synchronization,2,create-Create with user,delete-Delete with user,modify-Rename with user
 smrsh_dir=SMRSH directory,3,None