From c65a9155be4ba57d8ca4f05edfd676992fdc7a60 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 6 Jan 2016 09:52:15 -0500
Subject: [PATCH] Improve verification of SOGoLoginDomains array

---
 SoObjects/SOGo/SOGoSystemDefaults.m | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 9447b1da3..d4fa79980 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -268,16 +268,18 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
 {
   NSMutableArray *filteredLoginDomains;
   NSArray *domains;
-  NSEnumerator *objects;
   id currentObject;
+  int count;
   
   if (self->loginDomains == nil)
     {
       filteredLoginDomains = [NSMutableArray arrayWithArray: [self stringArrayForKey: @"SOGoLoginDomains"]];
       domains = [self domainIds];
-      objects = [filteredLoginDomains objectEnumerator];
-      while ((currentObject = [objects nextObject]))
+      count = [filteredLoginDomains count];
+      while (count > 0)
         {
+          count--;
+          currentObject = [filteredLoginDomains objectAtIndex: count];
           if (![domains containsObject: currentObject])
             {
               [filteredLoginDomains removeObject: currentObject];