--- lib/LDAP/Koha.pm	2009/04/29 08:48:16	49
+++ lib/LDAP/Koha.pm	2009/04/29 09:03:47	50
@@ -181,15 +181,19 @@
 				__ldap_search_to_sql( $filter, $reqData->{'filter'}->{$filter} );
 			}
 
-			$sql_where .= ' ' . join( " $filter ", @limits );
+			$sql_where .= ' ' . join( " $filter ", @limits ) if @limits;
 
 		}
 
+		my $sql_select = read_file( lc "sql/$objectclass.sql" );
 		if ( $sql_where ) {
-			$sql_where = " where $sql_where";
+			if ( $sql_select !~ m{where}i ) {
+				$sql_where = " where $sql_where";
+			} else {
+				$sql_where = " and $sql_where";
+			}
 		}
 
-		my $sql_select = read_file( lc "sql/$objectclass.sql" );
 
 		warn "# SQL:\n$sql_select\n", $sql_where ? $sql_where : '-- no where', "\n# DATA: ",dump( @values );
 		my $sth = $dbh->prepare( $sql_select . $sql_where . " LIMIT $max_results" ); # XXX remove limit?