From: Graham B. <gb...@us...> - 2002-09-11 12:49:19
|
Update of /cvsroot/perl-ldap/ldap/lib/Net/LDAP In directory usw-pr-cvs1:/tmp/cvs-serv8538/lib/Net/LDAP Modified Files: Search.pm Filter.pm Log Message: Fix perl5.004 compatability issues Index: Search.pm =================================================================== RCS file: /cvsroot/perl-ldap/ldap/lib/Net/LDAP/Search.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Search.pm 3 Jun 2002 15:26:46 -0000 1.7 +++ Search.pm 11 Sep 2002 12:49:09 -0000 1.8 @@ -12,7 +12,7 @@ use Net::LDAP::Constant qw(LDAP_SUCCESS LDAP_DECODING_ERROR); @ISA = qw(Net::LDAP::Message); -$VERSION = "0.08"; +$VERSION = "0.09"; sub first_entry { # compat @@ -131,9 +131,9 @@ $i++; } - $v ||= ($a->[1] ||= Net::LDAP::Util::canonical_dn( $a->[0]->dn, reverse => 1, separator => "\0")) + $v ||= ($a->[1] ||= Net::LDAP::Util::canonical_dn( $a->[0]->dn, "reverse" => 1, separator => "\0")) cmp - ($b->[1] ||= Net::LDAP::Util::canonical_dn( $b->[0]->dn, reverse => 1, separator => "\0")); + ($b->[1] ||= Net::LDAP::Util::canonical_dn( $b->[0]->dn, "reverse" => 1, separator => "\0")); } map { [ $_ ] } @{$self->{entries}}; } Index: Filter.pm =================================================================== RCS file: /cvsroot/perl-ldap/ldap/lib/Net/LDAP/Filter.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Filter.pm 31 Jan 2002 14:04:15 -0000 1.7 +++ Filter.pm 11 Sep 2002 12:49:11 -0000 1.8 @@ -7,7 +7,7 @@ use strict; use vars qw($VERSION); -$VERSION = "0.13"; +$VERSION = "0.14"; # filter = "(" filtercomp ")" # filtercomp = and / or / not / item @@ -117,12 +117,12 @@ # If the op is = and contains one or more * not # preceeded by \ then do partial matches - if ($op eq '=' && $val =~ /^(\\.|[^\\*]*)*\*/o ) { + if ($op eq '=' && $val =~ /^(\\.|[^\\*]+)*\*/o ) { my $n = []; my $type = 'initial'; - while ($val =~ s/^((\\.|[^\\*]*)*)\*//) { + while ($val =~ s/^((\\.|[^\\*]+)*)\*//) { push(@$n, { $type, _unescape("$1") }) # $1 is readonly, copy it if length($1) or $type eq 'any'; |