From 8abd175abb8a5abfd25bc9172554bc05c8ce40c3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:06:55 -0400
Subject: [PATCH] Merge branch 'domain_module_fixes' into 'master'
---
server/plugins-available/mail_plugin_dkim.inc.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 8edd657..a74c4b8 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -123,12 +123,18 @@
if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
- $amavis_user=exec('grep -o "^amavis:\|^vscan:" /etc/passwd');
+ if($app->system->is_user('amavis')) {
+ $amavis_user='amavis';
+ } elseif ($app->system->is_user('vscan')) {
+ $amavis_user='vscan';
+ }
+ else {
+ $amavis_user='';
+ }
if(!empty($amavis_user)) {
- $amavis_user=rtrim($amavis_user, ":");
mkdir($mail_config['dkim_path'], 0750, true);
exec('chown '.$amavis_user.' /var/lib/amavis/dkim');
- unset $amavis_user;
+ unset($amavis_user);
} else {
mkdir($mail_config['dkim_path'], 0755, true);
}
@@ -181,7 +187,7 @@
$app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG);
$success=true;
/* now we get the DKIM Public-key */
- exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout', $pubkey, $result);
+ exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout 2> /dev/null', $pubkey, $result);
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */
--
Gitblit v1.9.1