From 5002c89470b511dea3bb8eb64c81a71b7788fa0f Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem.moulin@fripost.org>
Date: Sat, 26 Jan 2013 20:32:10 +0100
Subject: wibble

---
 lib/Fripost/Schema/Util.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/Fripost/Schema/Util.pm')

diff --git a/lib/Fripost/Schema/Util.pm b/lib/Fripost/Schema/Util.pm
index 6fb84dc..2d1a60f 100644
--- a/lib/Fripost/Schema/Util.pm
+++ b/lib/Fripost/Schema/Util.pm
@@ -157,7 +157,7 @@ sub split_addr {
     my $addr = shift;
     my %options = @_;
 
-    $addr =~ /^(.*)\@([^@]+)$/s;
+    $addr =~ /^(.*)\@([^\@]+)$/s;
     my ($l,$d) = ($1, $2);
 
     if (defined $options{'-encode'}) {
@@ -246,7 +246,7 @@ sub ldap_and_filter {
         return $filters[0];
     }
     else {
-        @filters = map {'('.$_.')'} @filters;
+        @filters = map { /^\(.*\)$/ ? $_ : '('.$_.')' } @filters;
         return '(&'.(join '', @filters).')';
     }
 }
-- 
cgit v1.2.3