Maildir delivery for Sendmail

2025-07-23 00:30:33 +00:00 · 2007-12-21 23:00:48 +00:00
parent 721ee65e27
commit f50f7d0444
46 changed files with 57 additions and 2 deletions
--- 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) {
--- 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).
--- a/sendmail/config-aix
+++ b/sendmail/config-aix
@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-freebsd
+++ b/sendmail/config-freebsd
@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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
--- 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
--- 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
--- a/sendmail/config-hpux
+++ b/sendmail/config-hpux
@ -26,3 +26,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- a/sendmail/config-irix
+++ b/sendmail/config-irix
@ -34,3 +34,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- a/sendmail/config-macos
+++ b/sendmail/config-macos
@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-netbsd
+++ b/sendmail/config-netbsd
@ -31,3 +31,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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
--- 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
--- 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
--- a/sendmail/config-openbsd
+++ b/sendmail/config-openbsd
@ -30,3 +30,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- a/sendmail/config-openserver
+++ b/sendmail/config-openserver
@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- a/sendmail/config-osf1
+++ b/sendmail/config-osf1
@ -26,3 +26,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-solaris
+++ b/sendmail/config-solaris
@ -29,3 +29,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-unixware
+++ b/sendmail/config-unixware
@ -27,3 +27,4 @@ columns=2
 show_cmts=0
 prefix_cmts=0

+mail_type=0
--- 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