diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php index a8e90f189b47e43a25cfa02e40ace9c67c984733..154c6b99c487f7b009cd5b7741111c5617d853d7 100644 --- a/install/dist/lib/debian60.lib.php +++ b/install/dist/lib/debian60.lib.php @@ -39,7 +39,7 @@ class installer extends installer_base { $configure_lmtp = false; // use lmtp if installed - if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) { + if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) { $virtual_transport = 'lmtp:unix:private/dovecot-lmtp'; } @@ -168,7 +168,7 @@ class installer extends installer_base { } //* dovecot-managesieved - if(is_file('/usr/lib/dovecot/managesieve')) { + if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) { $dovecot_protocols .= ' sieve'; } diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 2d31b89bbd63bd459b1721e911e979820bcb0e60..095e99eeaef2715e4f03f701746a32e712579826 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -381,6 +381,11 @@ class installer_dist extends installer_base { $configure_lmtp = false; + // use lmtp if installed + if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) { + $virtual_transport = 'lmtp:unix:private/dovecot-lmtp'; + } + // check if virtual_transport must be changed if ($this->is_update) { $tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index c82fd16537daebade9706f989df254ccee950d67..f36997c87736e22923e17b39adfde1585170cb16 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1418,7 +1418,7 @@ class installer_base { $configure_lmtp = false; // use lmtp if installed - if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) { + if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) { $virtual_transport = 'lmtp:unix:private/dovecot-lmtp'; } @@ -1577,7 +1577,7 @@ class installer_base { } //* dovecot-managesieved - if(is_file('/usr/lib/dovecot/managesieve')) { + if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) { $dovecot_protocols .= ' sieve'; } diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index cf73cf93e75024b8ceaa123b1900667316c524b2..21a6a404ea25efd8a4ea3d626a63f7645d13d6ab 100644 --- a/server/plugins-available/postfix_server_plugin.inc.php +++ b/server/plugins-available/postfix_server_plugin.inc.php @@ -288,7 +288,7 @@ class postfix_server_plugin { $dovecot_protocols = 'imap pop3'; //* dovecot-lmtpd - if( ($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) || + if( ($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) || ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') ) { $virtual_transport = 'lmtp:unix:private/dovecot-lmtp'; @@ -296,7 +296,7 @@ class postfix_server_plugin { } //* dovecot-managesieved - if(is_file('/usr/lib/dovecot/managesieve')) { + if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) { $dovecot_protocols .= ' sieve'; }