From e631410a14d68c6c54242cf833c0de9c79bc09dd Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 21 Jul 2010 11:41:48 -0400 Subject: [PATCH] Fixed: FS#1220 - /var/vmail/(domain)/(user) directories and files not delete when mail_user is deleted via remote. --- server/plugins-available/postfix_server_plugin.inc.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index 216df11..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 ='"); -- Gitblit v1.9.1