steffen: server/kolab/kolab kolab_ca.sh,1.1,1.2 kolabd,1.5,1.6

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv31451/kolab

Modified Files:
	kolab_ca.sh kolabd 
Log Message:
trap errors in kolabd, ifb, ca bugfix

Index: kolab_ca.sh
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_ca.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_ca.sh	6 Jul 2004 23:49:10 -0000	1.1
+++ kolab_ca.sh	7 Jul 2004 17:05:15 -0000	1.2
@@ -146,8 +146,7 @@
 -newca)
     createconf $2
     shift
-    NEW="1"
-    if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
+    if [ ! -f ${CATOP}/serial ]; then
         # create the directory hierarchy
         mkdir ${CATOP}
         mkdir ${CATOP}/certs

Index: kolabd
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolabd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabd	18 Jun 2004 01:25:58 -0000	1.5
+++ kolabd	7 Jul 2004 17:05:15 -0000	1.6
@@ -149,19 +149,22 @@
 
 Kolab::superLog('Kolab is starting up');
 
-Kolab::LDAP::startup;
-
-Kolab::log('K', 'Loading backends');
-Kolab::LDAP::Backend::load;
-Kolab::LDAP::Backend::load('user');
-Kolab::LDAP::Backend::load('sf');
-Kolab::LDAP::Backend::load('dirservd',1);
-
-Kolab::log('K', 'Performing backend startup');
-&Kolab::LDAP::Backend::startup;
+eval {
+  Kolab::LDAP::startup;
 
-Kolab::log('K', 'Synchronising');
-Kolab::LDAP::sync;
+  Kolab::log('K', 'Loading backends');
+  Kolab::LDAP::Backend::load;
+  Kolab::LDAP::Backend::load('user');
+  Kolab::LDAP::Backend::load('sf');
+  Kolab::LDAP::Backend::load('dirservd',1);
+  
+  Kolab::log('K', 'Performing backend startup');
+  &Kolab::LDAP::Backend::startup;
+  
+  Kolab::log('K', 'Synchronising');
+  Kolab::LDAP::sync;
+  
+  Kolab::log('K', 'Synchronisation complete, starting up daemon');
+  run;
+}; Kolab::log( 'K', $@, KOLAB_ERROR ) if $@;
 
-Kolab::log('K', 'Synchronisation complete, starting up daemon');
-run;