From 5cbcfa21b903492db0c38fe000ea01bfb0565585 Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas@ponas.no>
Date: Tue, 15 Aug 2017 01:08:53 +0200
Subject: [PATCH] Repatch and rename

---
 wpDirAuth.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wpDirAuth.php b/wpDirAuth.php
index 09cf33a..d129dfb 100644
--- a/wpDirAuth.php
+++ b/wpDirAuth.php
@@ -56,7 +56,7 @@
 
 /*
 PLUGIN META INFO FOR WORDPRESS LISTINGS
-Plugin Name: wpDirAuth
+Plugin Name: wpDirAuth-PosixGroup
 Plugin URI:  http://wpdirauth.gilzow.com/
 Description: WordPress Directory Authentication (LDAP/LDAPS).
              Works with most LDAP enabled directory services, such as OpenLDAP,
@@ -557,7 +557,7 @@ else {
                     $rscLDAPSearch = ldap_search($connection,$baseDn,$strAuthGroup,$aryAttribs);
                     $arySearchResults = ldap_get_entries($connection,$rscLDAPSearch);
                     if(isset($arySearchResults[0]['dn'])){
-                        $aryAuthGroupsDN[] = $arySearchResults[0]['dn'];
+                        $aryAuthGroupsDN[] = $strAuthGroup;
                     }
                 }
 
@@ -565,10 +565,10 @@ else {
                     return new WP_Error('no_auth_groups_found',$errorTitle.__('No Authentication Groups found based on given group CN'));
                 }
 
-
-                $strFilterQuery = '(&'.$filterQuery.'(|';
-                foreach($aryAuthGroupsDN as $strAuthGroupDN){
-                    $strFilterQuery .= '(memberOf='.$strAuthGroupDN.')';
+		$memberFilterQuery = "(memberUid=".$username.")";
+		$strFilterQuery = '(&'.$memberFilterQuery.'(|';
+		foreach($aryAuthGroupsDN as $strAuthGroupDN){
+			$strFilterQuery .= "(".$strAuthGroupDN.")";
                 }
                 $strFilterQuery .= '))';
                 if(($rscLDAPSearchGroupMember = ldap_search($connection,$baseDn,$strFilterQuery)) !== false){
@@ -2432,4 +2432,4 @@ if(!function_exists('_wpdirauth_log')){
             error_log($strMessage);
         }
     }
-}
\ No newline at end of file
+}