From f71859792bc2ab06871d45dde841b9e224e92374 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Tue, 13 Sep 2011 08:09:50 +1200
Subject: [PATCH] Handle empty groups better.

---
 inc/drivers_ldap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php
index c3a704a7..895a2311 100644
--- a/inc/drivers_ldap.php
+++ b/inc/drivers_ldap.php
@@ -362,7 +362,7 @@ function LDAP_check($username, $password ){
 function sync_LDAP_groups(){
   global $c;
   $ldapDriver = getStaticLdap();
-  if ( $ldapDriver->valid ) return;
+  if ( ! $ldapDriver->valid ) return;
 
   $mapping = $c->authenticate_hook['config']['group_mapping_field'];
   //$attributes = array('cn','modifyTimestamp','memberUid');
@@ -467,7 +467,7 @@ function sync_LDAP_groups(){
           Principal::cacheDelete('username', $member);
         }
       }
-      $remove_users = array_diff ( $db_members, $ldap_members );
+      $remove_users = @array_flip( @array_flip( array_diff( $db_members, $ldap_members ) ));
       if ( sizeof ( $remove_users ) ){
         $c->messages[] = sprintf(i18n('- removing %s from group : %s'),join(', ', $remove_users ), $group);
         foreach ( $remove_users as $member ){