From e7663cef0f123d09d964b6d5177f8c0da081be1a Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Tue, 13 Nov 2012 07:34:55 -0500 Subject: [PATCH] Implemented: - added isset() checks to password encryption mode in remoting - if additional parameter "_ispconfig_pw_crypted" is set to "1" the password fields are not re-encrypted, this is useful when importing data from existing user-bases where no cleartext passwords are stored. Attention: crypted passwords need to have the same format or they won't work (i.e. CRYPT for CRYPT fields, PASSWORD() for mySQL fields) --- server/plugins-available/postfix_server_plugin.inc.php | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php index e426eb1..98dd675 100644 --- a/server/plugins-available/postfix_server_plugin.inc.php +++ b/server/plugins-available/postfix_server_plugin.inc.php @@ -106,7 +106,22 @@ } else { exec("postconf -e 'relayhost ='"); } - + + if($mail_config['realtime_blackhole_list'] != '') { + $rbl_hosts = explode(",",str_replace(" ", "", $mail_config['realtime_blackhole_list'])); + $options = explode(", ", exec("postconf -h smtpd_recipient_restrictions")); + foreach ($options as $key => $value) { + if (!preg_match('/reject_rbl_client/', $value)) { + $new_options[] = $value; + } + } + foreach ($rbl_hosts as $key => $value) { + $new_options[] = "reject_rbl_client ".$value; + } + + exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'"); + } + 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