From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 24 Jul 2016 05:30:59 -0400
Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders
---
install/lib/installer_base.lib.php | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 4f13ff3..9666ee8 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1366,21 +1366,25 @@
// Add the clamav user to the amavis group
exec('adduser clamav amavis');
-
- // Create the director for DKIM-Keys
- if(!is_dir('/var/lib/amavis/dkim')) mkdir('/var/lib/amavis/dkim', 0750, true);
- // get shell-user for amavis
- $amavis_user=exec('grep -o "^amavis:\|^vscan:" /etc/passwd');
- if(!empty($amavis_user)) {
- $amavis_user=rtrim($amavis_user, ":");
- exec('chown '.$amavis_user.' /var/lib/amavis/dkim');
- }
// get shell-group for amavis
$amavis_group=exec('grep -o "^amavis:\|^vscan:" /etc/group');
if(!empty($amavis_group)) {
$amavis_group=rtrim($amavis_group, ":");
- exec('chgrp '.$amavis_group.' /var/lib/amavis/dkim');
}
+ // get shell-user for amavis
+ $amavis_user=exec('grep -o "^amavis:\|^vscan:" /etc/passwd');
+ if(!empty($amavis_user)) {
+ $amavis_user=rtrim($amavis_user, ":");
+ }
+
+ // Create the director for DKIM-Keys
+ if(!is_dir('/var/lib/amavis')) mkdir('/var/lib/amavis', 0750, true);
+ if(!empty($amavis_user)) exec('chown '.$amavis_user.' /var/lib/amavis');
+ if(!empty($amavis_group)) exec('chgrp '.$amavis_group.' /var/lib/amavis');
+ if(!is_dir('/var/lib/amavis/dkim')) mkdir('/var/lib/amavis/dkim', 0750);
+ if(!empty($amavis_user)) exec('chown -R '.$amavis_user.' /var/lib/amavis/dkim');
+ if(!empty($amavis_group)) exec('chgrp -R '.$amavis_group.' /var/lib/amavis/dkim');
+
}
public function configure_spamassassin() {
@@ -1691,7 +1695,7 @@
if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
if(is_file('/etc/suphp/suphp.conf')) {
- replaceLine('/etc/suphp/suphp.conf', 'php=php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
+ replaceLine('/etc/suphp/suphp.conf', 'php="php:/usr/bin', 'x-httpd-suphp="php:/usr/bin/php-cgi"', 0);
//replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
replaceLine('/etc/suphp/suphp.conf', 'umask=0077', 'umask=0022', 0);
}
--
Gitblit v1.9.1