# HG changeset patch
# User Peter Marschall <peter@adpm.de>
# Date 1299360167 -3600
# Node ID d42bd1b087a1dea47654fa693a1a7caa252d1cf8
# Parent  7d170d1bc17b5d55c7aac3b06d24d338c09957ce
make_filter: cope with filters that are already parenthesized

Treat filter elements correctly that may be more complex filters
themselves; e.g. '(&(sn=Doe)(givenname=John))'

diff -r 7d170d1bc17b -r d42bd1b087a1 shelldap
--- a/shelldap	Sat Mar 05 22:13:27 2011 +0100
+++ b/shelldap	Sat Mar 05 22:22:47 2011 +0100
@@ -760,9 +760,9 @@
 	return unless scalar @$globs;
 
 	my $filter;
-	$filter = join '', map { "($_)" } @$globs;
-	$filter = '(|' . $filter . ')' if scalar @$globs > 1;
-	$filter = Net::LDAP::Filter->new( $filter );
+	$filter = join('', map { (/^\(.*\)$/o) ? $_ : "($_)" } @$globs);
+	$filter = '(|' . $filter . ')'  if (scalar(@$globs) > 1);
+	$filter = Net::LDAP::Filter->new($filter);
 
 	if ( $filter ) {
 		$self->debug('Filter parsed as: ' . $filter->as_string() . "\n");