From b42be8afbd0e927aa6db46a198e8dcecd0fb92b0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Jul 2010 10:53:53 -0400
Subject: [PATCH] Created branch for ISPConfig 3.0.3 stable releases.
---
server/plugins-available/postfix_server_plugin.inc.php | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index b9018de..3732cc7 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -86,7 +86,11 @@
if($mail_config["relayhost"] != '') {
exec("postconf -e 'relayhost = ".$mail_config["relayhost"]."'");
- exec("postconf -e 'smtp_sasl_auth_enable = yes'");
+ if($mail_config["relayhost_user"] != '' && $mail_config["relayhost_password"] != '') {
+ exec("postconf -e 'smtp_sasl_auth_enable = yes'");
+ } else {
+ exec("postconf -e 'smtp_sasl_auth_enable = no'");
+ }
exec("postconf -e 'smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd'");
exec("postconf -e 'smtp_sasl_security_options ='");
@@ -102,8 +106,8 @@
exec("postconf -e 'relayhost ='");
}
- exec("postconf -e 'mailbox_size_limit = ".intval($mail_config["mailbox_size_limit"])."'");
- exec("postconf -e 'message_size_limit = ".intval($mail_config["message_size_limit"])."'");
+ exec("postconf -e 'mailbox_size_limit = ".intval($mail_config["mailbox_size_limit"]*1024*1024)."'");
+ exec("postconf -e 'message_size_limit = ".intval($mail_config["message_size_limit"]*1024*1024)."'");
}
--
Gitblit v1.9.1