Item14512: more unicode DN fixes

foswiki · Oct 10, 2017 · e818128 · e818128
1 parent 756cb8b
commit e818128
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/data/System/LdapNgPlugin.txt b/data/System/LdapNgPlugin.txt
@@ -159,6 +159,7 @@ implements a fast solr-based person search with a different =SolrWikiUsersView=
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  10 Oct 2017: | fixed decoding of =dn= | 
 |  30 Aug 2017: | adjustments to recent changes in <nop>LdapContrib API |
 |  16 Jan 2017: | fix querying for users at all of the DNs configured in ={<nop>UserBase}= |
 |  02 Sep 2016: | added =nullformat= parameter to %LDAP macro |

diff --git a/lib/Foswiki/Plugins/LdapNgPlugin.pm b/lib/Foswiki/Plugins/LdapNgPlugin.pm
@@ -19,8 +19,8 @@ use strict;
 use warnings;
 
 our $core;
-our $VERSION = '6.42';
-our $RELEASE = '30 Aug 2017';
+our $VERSION = '6.43';
+our $RELEASE = '10 Oct 2017';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'Query and display data from an LDAP directory';
 

diff --git a/lib/Foswiki/Plugins/LdapNgPlugin/Core.pm b/lib/Foswiki/Plugins/LdapNgPlugin/Core.pm
@@ -163,7 +163,7 @@ sub handleLdap {
   my $index = 0;
   my @results = ();
   foreach my $entry (@entries) {
-    my $dn = $entry->dn();
+    my $dn = $ldap->getDN($entry);
     if ($theCasesensitive) {
       next if $theExclude && $dn =~ /$theExclude/;
       next if $theInclude && $dn !~ /$theInclude/;

diff --git a/lib/Foswiki/Plugins/LdapNgPlugin/DEPENDENCIES b/lib/Foswiki/Plugins/LdapNgPlugin/DEPENDENCIES
@@ -1,2 +1,2 @@
-Foswiki::Contrib::LdapContrib,>=7.70,perl,Required
+Foswiki::Contrib::LdapContrib,>=7.80,perl,Required
 Cache::Cache,>=1.05,CPAN,Required