Commit a8739d9e authored by Florian Schaal's avatar Florian Schaal

changed checkpath for dkim-dir

parent 919c2367
......@@ -117,14 +117,14 @@ class mail_plugin_dkim {
$app->log('Amavis-config not found or not writeable.', LOGLEVEL_ERROR);
$check=false;
}
/* dir for dkim-keys writeable? */
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
if ( isset($mail_config['dkim_path']) &&
!empty($mail_config['dkim_path']) &&
isset($data['new']['dkim_private']) &&
!empty($data['new']['dkim_private']) &&
$mail_config['dkim_path'] != '/' &&
$app->system->checkpath($mail_config['dkim_path'])
$mail_config['dkim_path'] != '/'
) {
if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
......@@ -150,6 +150,11 @@ class mail_plugin_dkim {
$check=false;
}
if ( !$app->system->checkpath($mail_config['dkim_path']) ) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' failed in checkpath.', LOGLEVEL_ERROR);
$check = false;
}
} else {
$app->log('Unable to write DKIM settings - no or invalid DKIM-Path defined', LOGLEVEL_ERROR);
$check=false;
......@@ -184,7 +189,7 @@ class mail_plugin_dkim {
* @param string $key_file full path to the key-file
* @param string $key_value private-key
* @param string $key_domain mail-domain
* @return bool - true when the key is written to disk
* @return bool - true when the private key was written to disk
*/
function write_dkim_key($key_file, $key_value, $key_domain) {
global $app, $mailconfig;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment