From daf1488cc314c65b663c7b2c6a3be72fca61b3e3 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 10 Jul 2012 04:07:05 -0400
Subject: [PATCH] corrected url() parameters
---
install/lib/installer_base.lib.php | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 9e5c503..16b64c3 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -664,6 +664,7 @@
'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
'virtual_uid_maps = static:'.$cf['vmail_userid'],
'virtual_gid_maps = static:'.$cf['vmail_groupid'],
+ 'inet_protocols=all',
'smtpd_sasl_auth_enable = yes',
'broken_sasl_auth_clients = yes',
'smtpd_sasl_authenticated_header = yes',
@@ -774,9 +775,22 @@
public function configure_saslauthd() {
global $conf;
+
+ //* Get saslsauthd version
+ exec('saslauthd -v 2>&1',$out);
+ $parts = explode(' ',$out[0]);
+ $saslversion = $parts[1];
+ unset($parts);
+ unset($out);
-
- $configfile = 'sasl_smtpd.conf';
+ if(version_compare($saslversion , '2.1.23') > 0) {
+ //* Configfile for saslauthd versions 2.1.24 and newer
+ $configfile = 'sasl_smtpd2.conf';
+ } else {
+ //* Configfile for saslauthd versions up to 2.1.23
+ $configfile = 'sasl_smtpd.conf';
+ }
+
if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf')) copy($conf['postfix']['config_dir'].'/sasl/smtpd.conf',$conf['postfix']['config_dir'].'/sasl/smtpd.conf~');
if(is_file($conf['postfix']['config_dir'].'/sasl/smtpd.conf~')) chmod($conf['postfix']['config_dir'].'/sasl/smtpd.conf~', 0400);
$content = rf('tpl/'.$configfile.'.master');
@@ -1416,7 +1430,7 @@
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);
$content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content);
- $content = str_replace('{mysql_server_ip}',$conf['mysql']['host'],$content);
+ $content = str_replace('{mysql_server_ip}',$conf['mysql']['ip'],$content);
}
wf($conf['vlogger']['config_dir'].'/'.$configfile,$content);
chmod($conf['vlogger']['config_dir'].'/'.$configfile, 0600);
--
Gitblit v1.9.1