Contributed Exim support

2026-02-03 14:13:29 +00:00 · 2008-09-02 18:29:40 +00:00
parent 1f0daa4225
commit b07ec9071e
15 changed files with 36 additions and 17 deletions
--- a/mailboxes/CHANGELOG
+++ b/mailboxes/CHANGELOG
@@ -51,3 +51,5 @@ Fixed a bug that broke searching by message body contents.
 Re-organized the Module Config page to make the first section less crowded.
 Added an option to skip messages flagged as deleted in a Maildir.
 Detection of messages with attachments is now 100% accurate, rather than taking a guess based on the MIME type.
+---- Changes since 1.430 ----
+Added support for Exim, thanks to Emmanuel Florac.
--- a/mailboxes/config.info
+++ b/mailboxes/config.info
@@ -51,7 +51,7 @@ from_virtualmin=Get From: address from Virtualmin?,1,1-Yes,0-No
 from_dom=Domain to use in From: address,3,System hostname

 line1=System configuration,11
-mail_system=Mail server installed,4,1-Sendmail,0-Postfix,2-Qmail,4-Qmail+LDAP,5-Qmail+VPopMail,3-Detect automatically
+mail_system=Mail server installed,4,1-Sendmail,0-Postfix,2-Qmail,4-Qmail+LDAP,5-Qmail+VPopMail,6-Exim,3-Detect automatically
 send_mode=Send mail using,10,-Mail server program,SMTP server
 no_crlf=Add carriage return ( \r ) to each line?,1,0-Yes,1-No
 smtp_user=SMTP login name for mail server,3,None
--- a/mailboxes/lang/ca
+++ b/mailboxes/lang/ca
@@ -3,7 +3,7 @@ index_none=NO tens perm
 index_header=Bústies d'usuaris
 index_empty=No hi ha correu
 index_return=a la llista d'usuaris
-index_esystem=No s'ha detectat al sistema cap dels servidors de correu suportats (Qmail, Postfix i Sendmail). Hauràs d'ajustar la <a href='$1'>configuració del mòdul</a> per configurar manualment el servidor de correu i possiblement els camins del correu.
+index_esystem=No s'ha detectat al sistema cap dels servidors de correu suportats (Exim, Qmail, Postfix i Sendmail). Hauràs d'ajustar la <a href='$1'>configuració del mòdul</a> per configurar manualment el servidor de correu i possiblement els camins del correu.
 index_esystem2=No s'ha trobat al sistema el servidor de correu establert a la <a href='$1'>configuració del mòdul</a>. Hauràs de modificar la configuració per que faci servir el servidor correcte.
 index_esystem3=S'ha produït un error en contactar el sistema de correu establert a la <a href='$1'>configuració del mòdul</a>: $2.
 index_system2=Servidor de correu: Qmail
--- a/mailboxes/lang/cz
+++ b/mailboxes/lang/cz
@@ -92,7 +92,7 @@ index_contains=obsahuje
 index_empty=Žádný mail
 index_eperl=Perlový podul $1 potřebný pro vybraný mód ověření SMTP není instalován nebo chybí závislý modul. <a href='$2'>Klikněte zde</a> pro instalaci.
 index_equals=odpovídá
-index_esystem=Nebyl detekován žádný z podporovaných serverů (Qmail, Postfix a Sendmail). Musíte upravit <a href='$1'>konfiguraci modulu</a> a nastavit mail server ručně.
+index_esystem=Nebyl detekován žádný z podporovaných serverů (Exim, Qmail, Postfix a Sendmail). Musíte upravit <a href='$1'>konfiguraci modulu</a> a nastavit mail server ručně.
 index_esystem2=Mail server nastavený v <a href='$1'>konfiguraci modulu</a> nebyl ve vašem systému nalezen. Musíte upravit konfiguraci a nastavit server správně.
 index_esystem3=Vyskytla se chyba dotykající se poštovního systému nastaveného v <a href='$1'>konfigiraci modulu</a> : $2.
 index_file=Čtení pošty ze souboru:
--- a/mailboxes/lang/de
+++ b/mailboxes/lang/de
@@ -90,7 +90,7 @@ index_contains=beinhaltet
 index_empty=Keine E-Mail
 index_eperl=Das Perl-Modul $1, welches f&#252;r den ausgew&#228;hlten SMTP-Authentisierungsmodus n&#246;tig ist, ist nicht installiert oder es fehlt ein zur Ausf&#252;hrung abh&#228;ngiges Modul. <a href='$2'>Klicken Sie hier</a> um dieses zu installieren.
 index_equals=ist gleich
-index_esystem=Keiner der unterst&#252;tzten E-Mailserver (Qmail, Postfix und Sendmail) wurde auf Ihrem System gefunden. Sie m&#252;ssen die <a href='$1'>Modulkonfiguration</a> manuell anpassen und dort den E-Mailserver und die zugeh&#246;rigen Serverpfade eintragen.
+index_esystem=Keiner der unterst&#252;tzten E-Mailserver (Exim, Qmail, Postfix und Sendmail) wurde auf Ihrem System gefunden. Sie m&#252;ssen die <a href='$1'>Modulkonfiguration</a> manuell anpassen und dort den E-Mailserver und die zugeh&#246;rigen Serverpfade eintragen.
 index_esystem2=Der in der <a href='$1'>Modulkonfiguration</a> gesetzte E-Mailserver wurde auf ihrem System nicht gefunden. Sie m&#252;ssen dort die Konfiguration so anpassen, da&#223; der richtige E-Mailserver benutzt wird.
 index_esystem3=Ein Fehler ist beim Zugriff auf das Mailsystem in <a href='$1'>Modulekonfiguration</a> augetreten: $2.
 index_file=Lese E-Mail in Datei:
--- a/mailboxes/lang/el
+++ b/mailboxes/lang/el
@@ -3,7 +3,7 @@ index_none=
 index_header=Θυρίδες ηλεκτρονικού ταχυδρομείου χρήστη
 index_empty=Κανένα μύνημα
 index_return=λίστα χρηστών
-index_esystem=Κανένας από τους υποστηριζόμενους διακομιστές mail (Qmail, Postfix and Sendmail) δεν ανιχνεύφθηκε στο σύστημά σας. Θα πρέπει να τροποποιήσετε την <a href='$1'>ρύθμιση του module </a> για να ορίσετε τον διακομιστή mail και πιθανόν χειροκίνητα τις διαδρομές φακέλων mail.
+index_esystem=Κανένας από τους υποστηριζόμενους διακομιστές mail (Exim, Qmail, Postfix and Sendmail) δεν ανιχνεύφθηκε στο σύστημά σας. Θα πρέπει να τροποποιήσετε την <a href='$1'>ρύθμιση του module </a> για να ορίσετε τον διακομιστή mail και πιθανόν χειροκίνητα τις διαδρομές φακέλων mail.
 index_esystem2=Ο διακομιστής mail που έχει οριστεί στην<a href='$1'>ρύθμιση module </a> δεν βρέθηκε στο σύστημά σας. Θα χρειαστεί να τροποποιήσετε την ρύθμιση για να χρησιμοποιήσετε τον σωστό διακομιστή.
 index_esystem3=Ένα σφάλμα συνέβη κατά την επικοινωνία με τον διακομιστή mail που έχει οριστεί στην <a href='$1'>ρύθμιση module</a> : $2.
 index_system2=Διακομιστής Mail: Qmail
--- a/mailboxes/lang/en
+++ b/mailboxes/lang/en
@@ -3,9 +3,12 @@ index_none=You are not allowed to read email for any users on this system.
 index_header=User mailboxes
 index_empty=No mail
 index_return=user list
-index_esystem=None of the supported mail servers (Qmail, Postfix and Sendmail) were detected on your system. You will need to adjust the <a href='$1'>module configuration</a> to set the mail server and possibly mail paths manually.
+index_esystem=None of the supported mail servers (Exim, Qmail, Postfix and Sendmail) were detected on your system. You will need to adjust the <a href='$1'>module configuration</a> to set the mail server and possibly mail paths manually.
 index_esystem2=The mail server set in the <a href='$1'>module configuration</a> was not found on your system. You will need to adjust the configuration to use the correct server.
 index_esystem3=An error occurred contacting the mail system set in the <a href='$1'>module configuration</a> : $2.
+index_system6=Mail server: Exim
+index_system5=Mail server: Qmail+VPopMail
+index_system4=Mail server: Qmail+LDAP
 index_system2=Mail server: Qmail
 index_system1=Mail server: Sendmail
 index_system0=Mail server: Postfix
--- a/mailboxes/lang/it
+++ b/mailboxes/lang/it
@@ -92,7 +92,7 @@ index_contains=contiene
 index_empty=Nessun messaggio
 index_eperl=Il modulo Perl $1 necessario per la modalit&#224; di autenticazione SMTP selezionata non &#232; installato, o manca un modulo da cui dipende. <a href='$2'>Clicca qui</a> per installarlo adesso.
 index_equals=uguale
-index_esystem=Nessun server di posta supportato (Qmail, Postfix and Sendmail) &#232; stato individuato nel tuo sistema. E' necessario verificare la <a href='$1'>configurazione del modulo</a> per impostare manualmente il server di posta eventualmente installato e i possibili percorsi in cui &#232; salvata la posta.
+index_esystem=Nessun server di posta supportato (Exim, Qmail, Postfix and Sendmail) &#232; stato individuato nel tuo sistema. E' necessario verificare la <a href='$1'>configurazione del modulo</a> per impostare manualmente il server di posta eventualmente installato e i possibili percorsi in cui &#232; salvata la posta.
 index_esystem2=Il server di posta impsotato nella <a href='$1'>configurazione del modulo</a> non &#232; stato trovato nel sistema. E' necessario verificare la configurazione impostando il aserver corretto da usare.
 index_esystem3=Si &#232; verificato un errore durante la comunicazione con il sistema di posta impostato nella <a href='$1'>configurazione del modulo</a>: $2
 index_file=Leggi la posta nel file:
--- a/mailboxes/lang/ko_KR.UTF-8
+++ b/mailboxes/lang/ko_KR.UTF-8
@@ -91,7 +91,7 @@ ham_title=Ham 으로 보고
 index_contains=포함
 index_empty=메일이 없습니다.
 index_eperl=SMTP 인증 모드를 위한 $1 펄모듈이 설치되어 있지 않거나, 의존성이 걸려있는 도뮬이 설치되어 있지 않습니다. 지금 설치 하려면 <a href='$2'>여기를 클릭</a>하십시오.
-index_esystem=메일 서버(Qmail, Postfix, Sendmail)를 시스템에서 찾을 수 없습니다. <a href='$1'>모듈 구성</a>에 메일 서버를 설정하고, 메일 경로를 수동으로 지정해 줘야 할 수도 있습니다.
+index_esystem=메일 서버(Exim, Qmail, Postfix, Sendmail)를 시스템에서 찾을 수 없습니다. <a href='$1'>모듈 구성</a>에 메일 서버를 설정하고, 메일 경로를 수동으로 지정해 줘야 할 수도 있습니다.
 index_esystem2=시스템에서 <a href='$1'>모듈 구성</a>에 설정되어 있는 메일 서버를 찾을 수 없습니다. 설정에서 정확한 서버를 재설정 하십시오.
 index_esystem3=<a href='$1'>모듈 구성</a>에 설정되어 있는 메일 시스템에 연결하는 동안 에러가 발생했습니다 :$2.
 index_file=파일의 메일 읽기:
--- a/mailboxes/lang/ko_KR.euc
+++ b/mailboxes/lang/ko_KR.euc
@@ -91,7 +91,7 @@ ham_title=Ham
 index_contains=포함
 index_empty=메일이 없습니다.
 index_eperl=SMTP 인증 모드를 위한 $1 펄모듈이 설치되어 있지 않거나, 의존성이 걸려있는 도뮬이 설치되어 있지 않습니다. 지금 설치 하려면 <a href='$2'>여기를 클릭</a>하십시오.
-index_esystem=메일 서버(Qmail, Postfix, Sendmail)를 시스템에서 찾을 수 없습니다. <a href='$1'>모듈 구성</a>에 메일 서버를 설정하고, 메일 경로를 수동으로 지정해 줘야 할 수도 있습니다.
+index_esystem=메일 서버(Exim, Qmail, Postfix, Sendmail)를 시스템에서 찾을 수 없습니다. <a href='$1'>모듈 구성</a>에 메일 서버를 설정하고, 메일 경로를 수동으로 지정해 줘야 할 수도 있습니다.
 index_esystem2=시스템에서 <a href='$1'>모듈 구성</a>에 설정되어 있는 메일 서버를 찾을 수 없습니다. 설정에서 정확한 서버를 재설정 하십시오.
 index_esystem3=<a href='$1'>모듈 구성</a>에 설정되어 있는 메일 시스템에 연결하는 동안 에러가 발생했습니다 :$2.
 index_file=파일의 메일 읽기:
--- a/mailboxes/lang/nl
+++ b/mailboxes/lang/nl
@@ -92,7 +92,7 @@ index_contains=bevat
 index_empty=Geen mail
 index_eperl=De Perl module $1 die nodig is voor de geselecteerde SMTP authenticatie mode is niet geinstalleerd of mist een afhankelijke module. <a href='$2'>Klik hier</a> om het nu te installeren.
 index_equals=Gelijken
-index_esystem=Geen van de ondersteunende mail servers (Qmail, Postfix and Sendmail) zijn gedetecteerd op uw systeem. U moet de <a href='$1'>module configuratie</a> handmatig veranderen om het pad naar de mail server te corrigeren.
+index_esystem=Geen van de ondersteunende mail servers (Exim, Qmail, Postfix and Sendmail) zijn gedetecteerd op uw systeem. U moet de <a href='$1'>module configuratie</a> handmatig veranderen om het pad naar de mail server te corrigeren.
 index_esystem2=De mail server waarnaar verwezen word in de <a href='$1'>module configuratie</a> is niet gevonden op uw systeem. U moet uw configuratie veranderen om de juiste server te gebruiken.
 index_esystem3=Er onstand een fout tijdens het kontakt maken met het mail systeem waarnaar verwezen word in de <a href='$1'>module configuratie</a> : $2.
 index_file=Lees Mail in File:
--- a/mailboxes/lang/tr
+++ b/mailboxes/lang/tr
@@ -90,7 +90,7 @@ index_contains=i
 index_empty=Posta yok
 index_eperl=Seçilen STMP doğrulama modu için $1 Perl modülüne ihtiyaç. <a href='$2'>buraya tıklayara yükleyebilirsiniz</a>
 index_equals=Eşitlik
-index_esystem=Sisteminizde desteklenen posta sunucuları (Qmail, Postfix ve Sendmail) yoktur. Posta sunucusunu ve mail yolunu açmak için <a href='$1'>modül yapılandırması</a>'nı elle ayarlamaya gereksinim duyacaksınız.
+index_esystem=Sisteminizde desteklenen posta sunucuları (Exim, Qmail, Postfix ve Sendmail) yoktur. Posta sunucusunu ve mail yolunu açmak için <a href='$1'>modül yapılandırması</a>'nı elle ayarlamaya gereksinim duyacaksınız.
 index_esystem2=<a href='$1'>modül yapılandırma</a>'daki mail sunucu ayarı sisteminizde bulunamadı. Doğru sunucuyu kullanmak için bu yapılandırmayı ayarlamanız gerekmektedir.
 index_esystem3=<a href='$1'>bu adresteki</a> posta sistem ayarına baglanırken hata oluştu : $2
 index_file=Dosyadaki postayı oku:
--- a/mailboxes/lang/zh_TW.Big5
+++ b/mailboxes/lang/zh_TW.Big5
@@ -65,7 +65,7 @@ forward_title=
 index_contains=包含
 index_empty=無郵件
 index_equals=等於
-index_esystem=在您的系統上找不到支援的郵件伺服器(Qmail, Postfix 和 Sendmail)，您可以手動調整<a href='$1'>模組組態</a>來設定郵件伺服器和郵件路徑
+index_esystem=在您的系統上找不到支援的郵件伺服器(Exim, Qmail, Postfix 和 Sendmail)，您可以手動調整<a href='$1'>模組組態</a>來設定郵件伺服器和郵件路徑
 index_esystem2=在您的系統上找不到<a href='$1'>模組組態</a>中設定的郵件伺服器，您需要調整正確的伺服器組態。
 index_find=在使用者名稱中找尋使用者
 index_header=使用者信箱
--- a/mailboxes/lang/zh_TW.UTF-8
+++ b/mailboxes/lang/zh_TW.UTF-8
@@ -65,7 +65,7 @@ forward_title=轉寄到電子郵件
 index_contains=包含
 index_empty=無郵件
 index_equals=等於
-index_esystem=在您的系統上找不到支援的郵件伺服器(Qmail, Postfix 和 Sendmail)，您可以手動調整<a href='$1'>模組組態</a>來設定郵件伺服器和郵件路徑
+index_esystem=在您的系統上找不到支援的郵件伺服器(Exim, Qmail, Postfix 和 Sendmail)，您可以手動調整<a href='$1'>模組組態</a>來設定郵件伺服器和郵件路徑
 index_esystem2=在您的系統上找不到<a href='$1'>模組組態</a>中設定的郵件伺服器，您需要調整正確的伺服器組態。
 index_find=在使用者名稱中找尋使用者
 index_header=使用者信箱
--- a/mailboxes/mailboxes-lib.pl
+++ b/mailboxes/mailboxes-lib.pl
@@ -248,6 +248,10 @@ if (!defined(@mail_style_cache)) {
 			# vpopmail always uses ~/Maildir
 			return ( undef, 0, undef, "Maildir" );
 			}
+ 		elsif ($config{'mail_system'} == 6) {
+ 			# localmail using smail or exim
+ 			return ( "/var/spool/mail", 0, undef, undef );
+ 			}
 		else {
 			# No mail server set yet!
 			return (undef, undef, undef, undef);
@@ -354,6 +358,7 @@ return $_[0]->{'type'} == 0 &&
 			 [ "qmailadmin", 2 ],
 			 [ "postfix", 0 ],
 			 [ "sendmail", 1 ],
+ 			 [undef, 6, \&check_exim ]
 			);

 # detect_mail_system()
@@ -413,6 +418,14 @@ return 0 if (&foreign_installed("qmailadmin", 1) != 2);
 return -x "$config{'vpopmail_dir'}/bin/vadddomain";
 }

+# check_exim()
+# Make sure Exim is installed
+sub check_exim
+{
+return &has_command('exim');
+}
+
+
 # test_qmail_ldap()
 # Returns undef the Qmail+LDAP database can be contacted OK, or an error message
 sub test_qmail_ldap
@@ -707,8 +720,9 @@ sub list_mail_users
 {
 local ($max, $filter) = @_;
 local @rv;
-if ($config{'mail_system'} < 3) {
-	# Postfix, Sendmail and Qmail all use Unix users
+
+if ($config{'mail_system'} < 3 or $config{'mail_system'} == 6 ) {
+	# Postfix, Sendmail, smail, exim and Qmail all use Unix users
 	local %found;
 	local %hfound;
 	local ($dir, $style, $mailbox, $maildir) = &get_mail_style();
@@ -798,8 +812,8 @@ return @rv;
 # Looks up a user by name
 sub get_mail_user
 {
-if ($config{'mail_system'} < 3) {
-	# Just find Unix user
+if ($config{'mail_system'} < 3 || $config{'mail_system'} == 6) {
+	# Just find Unix user for Sendmail, Postfix, Qmail and Exim
 	return getpwnam($_[0]);
 	}
 elsif ($config{'mail_system'} == 4) {