From 76be2b7047ab4573c1225a50a9cbc36330cd4140 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 01 Apr 2014 10:08:06 -0400
Subject: [PATCH] fixed mail_plugin_dkim.inc.php and add dkim-selector to dns
---
server/plugins-available/mail_plugin_dkim.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 2617d1e..0f0f6ef 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -205,7 +205,7 @@
* This function adds the entry to the amavisd-config
* @param string $key_domain mail-domain
*/
- function add_to_amavis($key_domain) {
+ function add_to_amavis($key_domain, $selector, $old_selector) {
global $app, $mail_config;
if (empty($selector)) $selector = 'default';
@@ -287,7 +287,7 @@
if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' )
$mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
if ($this->write_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['dkim_private'], $data['new']['domain'])) {
- if ($this->add_to_amavis($data['new']['domain'])) {
+ if ($this->add_to_amavis($data['new']['domain'], $data['new']['dkim_selector'], $data['old']['dkim_selector'] )) {
$this->restart_amavis();
} else {
$this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
--
Gitblit v1.9.1