From 1f44b67ec6586e328b98781722f30db198b84734 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 06 Jun 2012 06:39:10 -0400
Subject: [PATCH] Fixed: FS#2043 - SASL configuration mistake Fixed: PHP notices in jailkit user plugin.
---
install/lib/installer_base.lib.php | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 832d5b7..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');
--
Gitblit v1.9.1