Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Zvonimir
ISPConfig 3
Commits
fe869a17
Commit
fe869a17
authored
Aug 08, 2014
by
Florian Schaal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use $app->system->is_user instead of exec passwd
parent
4c794a56
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
server/plugins-available/mail_plugin_dkim.inc.php
server/plugins-available/mail_plugin_dkim.inc.php
+3
-2
No files found.
server/plugins-available/mail_plugin_dkim.inc.php
View file @
fe869a17
...
...
@@ -123,9 +123,10 @@ class mail_plugin_dkim {
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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment