From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
install/lib/installer_base.lib.php | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3ee0a35..fc264ec 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -750,9 +750,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');
@@ -1392,7 +1405,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