From fe869a17d729b9b33303a2948f834855cfb8d3f0 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 08 Aug 2014 09:28:17 -0400
Subject: [PATCH] use $app->system->is_user instead of exec passwd
---
server/plugins-available/mail_plugin_dkim.inc.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 0767427..3c8520f 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -123,9 +123,10 @@
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);
--
Gitblit v1.9.1