summaryrefslogtreecommitdiff
path: root/php-kolab/Kolab_Filter
diff options
context:
space:
mode:
authorSascha Wilde <wilde@intevation.de>2008-02-13 16:28:27 (GMT)
committerSascha Wilde <wilde@intevation.de>2008-02-13 16:28:27 (GMT)
commit2b57ae7c6d3c4bf32ca04ff1bde25b6453be7444 (patch)
tree89b01bee1e39ee2329dbd034797f51e8c5997a8e /php-kolab/Kolab_Filter
parent0fe1e82d20bf272881219846b7d2613bdb6d219c (diff)
downloadserver-2b57ae7c6d3c4bf32ca04ff1bde25b6453be7444.tar.gz
Fixed handling of empty sender address
(caused vacation messages to be marked untrusted). kolab/issue1272
Diffstat (limited to 'php-kolab/Kolab_Filter')
-rw-r--r--php-kolab/Kolab_Filter/ChangeLog5
-rw-r--r--php-kolab/Kolab_Filter/Filter/Content.php4
2 files changed, 9 insertions, 0 deletions
diff --git a/php-kolab/Kolab_Filter/ChangeLog b/php-kolab/Kolab_Filter/ChangeLog
index 85bc67b..fe1160d 100644
--- a/php-kolab/Kolab_Filter/ChangeLog
+++ b/php-kolab/Kolab_Filter/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-13 Sascha Wilde <wilde@intevation.de>
+
+ * Filter/Content.php (verify_sender): When no client address is
+ given assume $local_addr as client.
+
2008-02-12 Gunnar Wrobel <p@rdus.de>
* Filter/Filter.php:
diff --git a/php-kolab/Kolab_Filter/Filter/Content.php b/php-kolab/Kolab_Filter/Filter/Content.php
index 0a19053..fe2b75c 100644
--- a/php-kolab/Kolab_Filter/Filter/Content.php
+++ b/php-kolab/Kolab_Filter/Filter/Content.php
@@ -436,6 +436,10 @@ function verify_sender($sasluser, $sender, $fromhdr, $client_addr) {
$local_addr = '127.0.0.1';
}
+ if (empty($client_addr)) {
+ $client_addr = $local_addr;
+ }
+
if (isset($conf['filter']['verify_subdomains'])) {
$verify_subdomains = $conf['filter']['verify_subdomains'];
} else {