Skip to content

Commit fe869a1

Browse files
author
Florian Schaal
committed
use $app->system->is_user instead of exec passwd
1 parent 4c794a5 commit fe869a1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

server/plugins-available/mail_plugin_dkim.inc.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ function check_system($data) {
123123

124124
if (!is_dir($mail_config['dkim_path'])) {
125125
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
126-
$amavis_user=exec('grep -o "^amavis:\|^vscan:" /etc/passwd');
126+
if($app->system->is_user('amavis')) { $amavis_user='amavis'; }
127+
elseif ($app->system->is_user('vscan')) { $amavis_user='vscan'; }
128+
else { $amavis_user=''; }
127129
if(!empty($amavis_user)) {
128-
$amavis_user=rtrim($amavis_user, ":");
129130
mkdir($mail_config['dkim_path'], 0750, true);
130131
exec('chown '.$amavis_user.' /var/lib/amavis/dkim');
131132
unset($amavis_user);

0 commit comments

Comments
 (0)