From e3dd3b352295a8569cf8cc77a9e0bdcb923b6f9c Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 1 Apr 2009 18:50:32 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: bafccbe12139895411068d388269aca400af46ec
Monotone-Revision: 7491be61ec53fdb2d4b8819659ba34568c97d059

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-04-01T18:50:32
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                  | 8 +++++++-
 SoObjects/Contacts/SOGoContactLDAPFolder.m | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18126fe70..b3d437c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,13 @@
 
 	* Dropped worthless tools
 	* Fixed tons of compiler warnings
-
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m
+	([SOGoContactLDAPFolder appendObject:withBaseURL:
+	toREPORTResponse:]): We now check if we've got
+	an exception when looking up contacts and the LDAP-part
+	of SOGo is misconfigured and warn the admin (by adding
+	a log entry) about it.
+	
 2009-03-31  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index c7a406541..a55464386 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -1,6 +1,6 @@
 /* SOGoContactLDAPFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2006-2008 Inverse inc.
+ * Copyright (C) 2006-2009 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -35,6 +35,7 @@
 #import <NGObjWeb/SoSelectorInvocation.h>
 #import <NGObjWeb/SoUser.h>
 #import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <EOControl/EOSortOrdering.h>
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -61,6 +62,12 @@
     {
       component = [self lookupName: name inContext: context acquire: NO];
 
+      if ([component isKindOfClass: [NSException class]])
+	{
+	  [self logWithFormat: @"Object with name '%@' not found. You likely have a LDAP configuration issue.", name];
+	  return;
+	}
+
       [r appendContentString: @"  <D:response>\r\n"];
       [r appendContentString: @"    <D:href>"];
       [r appendContentString: baseURL];