From ca78ff546c8f227a4d4b4a921e66cbaacb277b8c Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 17 Feb 2011 20:06:12 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: 5b2bc8f17ae0dbc785abcc143ebf3cd49d100698
Monotone-Revision: b0f0e0a5f736b92a629c7c421d50a5ae9f3f8c6e

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-02-17T20:06:12
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                   | 10 ++++++----
 Tools/sogo-ealarms-notify.m | 22 ++++++----------------
 Tools/sogo-slapd-sockd.m    | 21 +++++----------------
 Tools/sogo-tool.m           | 21 +++++----------------
 4 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3580dbd3..2bade91f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-<<<<<<< variant A
+2011-02-17  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * Modifed all tools to NOT check for SOGoUserSources
+	as it'll break if we are in multi-domain with no
+	master sources defined.
+
 2011-02-15  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoCalendarComponent.m
@@ -7,15 +12,12 @@
 	SOGoEnableEMailAlarms was set to YES prior doing this.
 	This fixes bug #1079.
 
->>>>>>> variant B
 2011-02-16  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow):
 	fixed a bug with IE8 that would not set the "checked" attribute
 	properly on a checkbox.
 
-####### Ancestor
-======= end
 2011-02-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxDatePicker.m
diff --git a/Tools/sogo-ealarms-notify.m b/Tools/sogo-ealarms-notify.m
index 24580fbb0..0e1f281f7 100644
--- a/Tools/sogo-ealarms-notify.m
+++ b/Tools/sogo-ealarms-notify.m
@@ -40,25 +40,15 @@ main (int argc, char **argv, char **env)
   ud = [NSUserDefaults standardUserDefaults];
   [ud addSuiteNamed: @"sogod"];
 
-  if ([ud objectForKey: @"SOGoUserSources"])
+  if ([ud objectForKey: @"SOGoEnableEMailAlarms"])
     {
-      if ([ud objectForKey: @"SOGoEnableEMailAlarms"])
-        {
-          notifier = [SOGoEAlarmsNotifier new];
-          if (![notifier run])
-            rc = -1;
-          [notifier release];
-        }
-      else
-        NSLog (@"EMail alarms are disabled in the SOGo configuration.");
+      notifier = [SOGoEAlarmsNotifier new];
+      if (![notifier run])
+	rc = -1;
+      [notifier release];
     }
   else
-    {
-      NSLog (@"No LDAP source is configured in the SOGo configuration of this"
-             @" account. Please make sure to use this tool under the same"
-             @" username as SOGo.");
-      rc = -1;
-    }
+    NSLog (@"EMail alarms are disabled in the SOGo configuration.");
 
   [pool release];
 
diff --git a/Tools/sogo-slapd-sockd.m b/Tools/sogo-slapd-sockd.m
index a12b32384..fd7662be3 100644
--- a/Tools/sogo-slapd-sockd.m
+++ b/Tools/sogo-slapd-sockd.m
@@ -40,23 +40,12 @@ main (int argc, char **argv, char **env)
   ud = [NSUserDefaults standardUserDefaults];
   [ud addSuiteNamed: @"sogod"];
 
-  if ([ud objectForKey: @"SOGoUserSources"])
-    {
-      sockd = [SOGoSockD new];
-      if ([sockd run])
-        rc = 0;
-      else
-        rc = -1;
-      [sockd release];
-    }
+  sockd = [SOGoSockD new];
+  if ([sockd run])
+    rc = 0;
   else
-    {
-      NSLog (@"No LDAP source is configured in the SOGo configuration of this"
-             @" account. Please make sure to use this tool under the same"
-             @" username as SOGo.");
-      rc = -1;
-    }
-
+    rc = -1;
+  [sockd release];
   [pool release];
 
   return rc;
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index ea36ecea4..1d26bbc54 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -245,23 +245,12 @@ main (int argc, char **argv, char **env)
   ud = [NSUserDefaults standardUserDefaults];
   setupUserDefaults (ud);
 
-  if ([ud objectForKey: @"SOGoUserSources"])
-    {
-      dispatcher = [SOGoToolDispatcher new];
-      if ([dispatcher run])
-        rc = 0;
-      else
-        rc = -1;
-      [dispatcher release];
-    }
+  dispatcher = [SOGoToolDispatcher new];
+  if ([dispatcher run])
+    rc = 0;
   else
-    {
-      NSLog (@"No LDAP source is configured in the SOGo configuration of this"
-             @" account. Please make sure to use this tool under the same"
-             @" username as SOGo.");
-      rc = -1;
-    }
-
+    rc = -1;
+  [dispatcher release];
   [pool release];
 
   return rc;