From 588b8acf7dffc48bf4231c8e8dc742e46fd04411 Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Thu, 19 Apr 2007 09:59:17 +0000
Subject: [PATCH] Fix the initialisation of the calendar library

---
 src/agents/store/stored.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/agents/store/stored.c b/src/agents/store/stored.c
index 245be29..5119bc9 100644
--- a/src/agents/store/stored.c
+++ b/src/agents/store/stored.c
@@ -222,6 +222,7 @@ _XplServiceMain(int argc, char *argv[])
     int maxThreads;
     int minSleep;
     int i;
+    BOOL cal_success;
     int startupOpts;
 #ifdef WIN32
     XplThreadID id;
@@ -248,12 +249,7 @@ _XplServiceMain(int argc, char *argv[])
         XplConsolePrintf(AGENT_NAME ": Exiting.\r\n");
         return -1;
     }
-
-    if (!BongoCalInit(MsgGetDBFDir(NULL))) {
-        XplConsolePrintf(AGENT_NAME ": Couldn't initialize calendaring library.  Exiting.\r\n");
-        return -1;
-    }
-
+ 
     if (! StoreAgent.installMode) {
         if (!(StoreAgent.handle.directory = (MDBHandle)MsgInit())) {
             XplBell();
@@ -264,6 +260,14 @@ _XplServiceMain(int argc, char *argv[])
         }
     
         MsgGetServerDN(StoreAgent.server.dn);
+        cal_success = BongoCalInit(MsgGetDBFDir(NULL));
+    } else {
+        cal_success = BongoCalInit(XPL_DEFAULT_DBF_DIR);
+    }
+    
+    if (! cal_success) {
+        XplConsolePrintf(AGENT_NAME ": Couldn't initialize calendaring library.  Exiting.\r\n");
+        return -1;
     }
 
     CONN_TRACE_INIT((char *)MsgGetWorkDir(NULL), "store");